Skip to content

Commit

Permalink
handle large number of predicates without timing out (#13979)
Browse files Browse the repository at this point in the history 
Signed-off-by: Andres Taylor <andres@planetscale.com>
Signed-off-by: Florent Poinsard <florent.poinsard@outlook.fr>
  • Loading branch information
@systay @frouioui
systay authored and frouioui committed Sep 19, 2023
1 parent f2446d9 commit 4ae54f9
Show file tree
Hide file tree
Showing 5 changed files with 86 additions and 77 deletions.
39 changes: 14 additions & 25 deletions go/vt/sqlparser/ast_funcs.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -986,29 +986,14 @@ func (node *Select) GetParsedComments() *ParsedComments {
// AddWhere adds the boolean expression to the
// WHERE clause as an AND condition.
func (node *Select) AddWhere(expr Expr) {
if node.Where == nil {
node.Where = &Where{
Type: WhereClause,
Expr: expr,
}
return
}
exprs := SplitAndExpression(nil, node.Where.Expr)
node.Where.Expr = AndExpressions(append(exprs, expr)...)
node.Where = addPredicate(node.Where, expr)
}

// AddHaving adds the boolean expression to the
// HAVING clause as an AND condition.
func (node *Select) AddHaving(expr Expr) {
if node.Having == nil {
node.Having = &Where{
Type: HavingClause,
Expr: expr,
}
return
}
exprs := SplitAndExpression(nil, node.Having.Expr)
node.Having.Expr = AndExpressions(append(exprs, expr)...)
node.Having = addPredicate(node.Having, expr)
node.Having.Type = HavingClause
}

// AddGroupBy adds a grouping expression, unless it's already present
Expand All @@ -1025,17 +1010,21 @@ func (node *Select) AddGroupBy(expr Expr) {
// AddWhere adds the boolean expression to the
// WHERE clause as an AND condition.
func (node *Update) AddWhere(expr Expr) {
if node.Where == nil {
node.Where = &Where{
node.Where = addPredicate(node.Where, expr)
}

func addPredicate(where *Where, pred Expr) *Where {
if where == nil {
return &Where{
Type: WhereClause,
Expr: expr,
Expr: pred,
}
return
}
node.Where.Expr = &AndExpr{
Left: node.Where.Expr,
Right: expr,
where.Expr = &AndExpr{
Left: where.Expr,
Right: pred,
}
return where
}

// AddOrder adds an order by element
Expand Down
61 changes: 25 additions & 36 deletions go/vt/sqlparser/ast_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,46 +49,35 @@ func TestAppend(t *testing.T) {
}

func TestSelect(t *testing.T) {
tree, err := Parse("select * from t where a = 1")
e1, err := ParseExpr("a = 1")
require.NoError(t, err)
expr := tree.(*Select).Where.Expr

sel := &Select{}
sel.AddWhere(expr)
buf := NewTrackedBuffer(nil)
sel.Where.Format(buf)
assert.Equal(t, " where a = 1", buf.String())
sel.AddWhere(expr)
buf = NewTrackedBuffer(nil)
sel.Where.Format(buf)
assert.Equal(t, " where a = 1", buf.String())

sel = &Select{}
sel.AddHaving(expr)
buf = NewTrackedBuffer(nil)
sel.Having.Format(buf)
assert.Equal(t, " having a = 1", buf.String())

sel.AddHaving(expr)
buf = NewTrackedBuffer(nil)
sel.Having.Format(buf)
assert.Equal(t, " having a = 1", buf.String())

tree, err = Parse("select * from t where a = 1 or b = 1")
e2, err := ParseExpr("b = 2")
require.NoError(t, err)
expr = tree.(*Select).Where.Expr
sel = &Select{}
sel.AddWhere(expr)
buf = NewTrackedBuffer(nil)
sel.Where.Format(buf)
assert.Equal(t, " where a = 1 or b = 1", buf.String())
t.Run("single predicate where", func(t *testing.T) {
sel := &Select{}
sel.AddWhere(e1)
assert.Equal(t, " where a = 1", String(sel.Where))
})

sel = &Select{}
sel.AddHaving(expr)
buf = NewTrackedBuffer(nil)
sel.Having.Format(buf)
assert.Equal(t, " having a = 1 or b = 1", buf.String())
t.Run("single predicate having", func(t *testing.T) {
sel := &Select{}
sel.AddHaving(e1)
assert.Equal(t, " having a = 1", String(sel.Having))
})

t.Run("double predicate where", func(t *testing.T) {
sel := &Select{}
sel.AddWhere(e1)
sel.AddWhere(e2)
assert.Equal(t, " where a = 1 and b = 2", String(sel.Where))
})

t.Run("double predicate having", func(t *testing.T) {
sel := &Select{}
sel.AddHaving(e1)
sel.AddHaving(e2)
assert.Equal(t, " having a = 1 and b = 2", String(sel.Having))
})
}

func TestUpdate(t *testing.T) {
Expand Down
31 changes: 31 additions & 0 deletions go/vt/vtgate/planbuilder/testdata/filter_cases.json
View file

Large diffs are not rendered by default.

16 changes: 8 additions & 8 deletions go/vt/vtgate/planbuilder/testdata/info_schema57_cases.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -763,7 +763,7 @@
"Sharded": false
},
"FieldQuery": "select * from INFORMATION_SCHEMA.`TABLES` where 1 != 1",
"Query": "select * from INFORMATION_SCHEMA.`TABLES` where TABLE_SCHEMA = :__vtschemaname /* VARCHAR */",
"Query": "select * from INFORMATION_SCHEMA.`TABLES` where TABLE_SCHEMA = :__vtschemaname /* VARCHAR */ and TABLE_SCHEMA = :__vtschemaname /* VARCHAR */",
"SysTableTableSchema": "[VARCHAR(\"user\"), VARCHAR(\"main\")]",
"Table": "INFORMATION_SCHEMA.`TABLES`"
}
Expand All @@ -779,7 +779,7 @@
"Sharded": false
},
"FieldQuery": "select TABLE_CATALOG, TABLE_SCHEMA, TABLE_NAME, TABLE_TYPE, `ENGINE`, VERSION, `ROW_FORMAT`, TABLE_ROWS, `AVG_ROW_LENGTH`, DATA_LENGTH, MAX_DATA_LENGTH, INDEX_LENGTH, DATA_FREE, `AUTO_INCREMENT`, CREATE_TIME, UPDATE_TIME, CHECK_TIME, TABLE_COLLATION, `CHECKSUM`, CREATE_OPTIONS, TABLE_COMMENT from INFORMATION_SCHEMA.`TABLES` where 1 != 1",
"Query": "select TABLE_CATALOG, TABLE_SCHEMA, TABLE_NAME, TABLE_TYPE, `ENGINE`, VERSION, `ROW_FORMAT`, TABLE_ROWS, `AVG_ROW_LENGTH`, DATA_LENGTH, MAX_DATA_LENGTH, INDEX_LENGTH, DATA_FREE, `AUTO_INCREMENT`, CREATE_TIME, UPDATE_TIME, CHECK_TIME, TABLE_COLLATION, `CHECKSUM`, CREATE_OPTIONS, TABLE_COMMENT from INFORMATION_SCHEMA.`TABLES` where TABLE_SCHEMA = :__vtschemaname /* VARCHAR */",
"Query": "select TABLE_CATALOG, TABLE_SCHEMA, TABLE_NAME, TABLE_TYPE, `ENGINE`, VERSION, `ROW_FORMAT`, TABLE_ROWS, `AVG_ROW_LENGTH`, DATA_LENGTH, MAX_DATA_LENGTH, INDEX_LENGTH, DATA_FREE, `AUTO_INCREMENT`, CREATE_TIME, UPDATE_TIME, CHECK_TIME, TABLE_COLLATION, `CHECKSUM`, CREATE_OPTIONS, TABLE_COMMENT from INFORMATION_SCHEMA.`TABLES` where TABLE_SCHEMA = :__vtschemaname /* VARCHAR */ and TABLE_SCHEMA = :__vtschemaname /* VARCHAR */",
"SysTableTableSchema": "[VARCHAR(\"user\"), VARCHAR(\"main\")]",
"Table": "INFORMATION_SCHEMA.`TABLES`"
}
Expand Down Expand Up @@ -1241,7 +1241,7 @@
"Sharded": false
},
"FieldQuery": "select 1 as found from information_schema.`tables` where 1 != 1",
"Query": "select 1 as found from information_schema.`tables` where table_schema = :__vtschemaname /* VARCHAR */",
"Query": "select 1 as found from information_schema.`tables` where table_schema = :__vtschemaname /* VARCHAR */ and table_schema = :__vtschemaname /* VARCHAR */",
"SysTableTableSchema": "[VARCHAR(\"music\"), VARCHAR(\"Music\")]",
"Table": "information_schema.`tables`"
},
Expand All @@ -1253,7 +1253,7 @@
"Sharded": false
},
"FieldQuery": "select 1 as found from information_schema.views where 1 != 1",
"Query": "select 1 as found from information_schema.views where table_schema = :__vtschemaname /* VARCHAR */ limit 1",
"Query": "select 1 as found from information_schema.views where table_schema = :__vtschemaname /* VARCHAR */ and table_schema = :__vtschemaname /* VARCHAR */ limit 1",
"SysTableTableSchema": "[VARCHAR(\"music\"), VARCHAR(\"user\")]",
"Table": "information_schema.views"
}
Expand All @@ -1271,7 +1271,7 @@
"Sharded": false
},
"FieldQuery": "select 1 as found from information_schema.`tables` where 1 != 1 union all (select 1 as found from information_schema.views where 1 != 1)",
"Query": "select 1 as found from information_schema.`tables` where table_schema = :__vtschemaname /* VARCHAR */ union all (select 1 as found from information_schema.views where table_schema = :__vtschemaname /* VARCHAR */ limit 1)",
"Query": "select 1 as found from information_schema.`tables` where table_schema = :__vtschemaname /* VARCHAR */ and table_schema = :__vtschemaname /* VARCHAR */ union all (select 1 as found from information_schema.views where table_schema = :__vtschemaname /* VARCHAR */ and table_schema = :__vtschemaname /* VARCHAR */ limit 1)",
"SysTableTableSchema": "[VARCHAR(\"music\"), VARCHAR(\"Music\"), VARCHAR(\"music\"), VARCHAR(\"user\")]",
"Table": "information_schema.`tables`"
}
Expand All @@ -1294,7 +1294,7 @@
"Sharded": false
},
"FieldQuery": "select 1 as found from information_schema.`tables` where 1 != 1",
"Query": "select 1 as found from information_schema.`tables` where table_schema = :__vtschemaname /* VARCHAR */",
"Query": "select 1 as found from information_schema.`tables` where table_schema = :__vtschemaname /* VARCHAR */ and table_schema = :__vtschemaname /* VARCHAR */",
"SysTableTableSchema": "[VARCHAR(\"music\"), VARCHAR(\"Music\")]",
"Table": "information_schema.`tables`"
},
Expand All @@ -1306,7 +1306,7 @@
"Sharded": false
},
"FieldQuery": "select 1 as found from information_schema.views where 1 != 1",
"Query": "select 1 as found from information_schema.views where table_schema = :__vtschemaname /* VARCHAR */ limit 1",
"Query": "select 1 as found from information_schema.views where table_schema = :__vtschemaname /* VARCHAR */ and table_schema = :__vtschemaname /* VARCHAR */ limit 1",
"SysTableTableSchema": "[VARCHAR(\"music\"), VARCHAR(\"user\")]",
"Table": "information_schema.views"
}
Expand All @@ -1324,7 +1324,7 @@
"Sharded": false
},
"FieldQuery": "select 1 as found from information_schema.`tables` where 1 != 1 union all (select 1 as found from information_schema.views where 1 != 1)",
"Query": "select 1 as found from information_schema.`tables` where table_schema = :__vtschemaname /* VARCHAR */ union all (select 1 as found from information_schema.views where table_schema = :__vtschemaname /* VARCHAR */ limit 1)",
"Query": "select 1 as found from information_schema.`tables` where table_schema = :__vtschemaname /* VARCHAR */ and table_schema = :__vtschemaname /* VARCHAR */ union all (select 1 as found from information_schema.views where table_schema = :__vtschemaname /* VARCHAR */ and table_schema = :__vtschemaname /* VARCHAR */ limit 1)",
"SysTableTableSchema": "[VARCHAR(\"music\"), VARCHAR(\"Music\"), VARCHAR(\"music\"), VARCHAR(\"user\")]",
"Table": "information_schema.`tables`"
}
Expand Down
16 changes: 8 additions & 8 deletions go/vt/vtgate/planbuilder/testdata/info_schema80_cases.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -845,7 +845,7 @@
"Sharded": false
},
"FieldQuery": "select * from INFORMATION_SCHEMA.`TABLES` where 1 != 1",
"Query": "select * from INFORMATION_SCHEMA.`TABLES` where TABLE_SCHEMA = :__vtschemaname /* VARCHAR */",
"Query": "select * from INFORMATION_SCHEMA.`TABLES` where TABLE_SCHEMA = :__vtschemaname /* VARCHAR */ and TABLE_SCHEMA = :__vtschemaname /* VARCHAR */",
"SysTableTableSchema": "[VARCHAR(\"user\"), VARCHAR(\"main\")]",
"Table": "INFORMATION_SCHEMA.`TABLES`"
}
Expand All @@ -861,7 +861,7 @@
"Sharded": false
},
"FieldQuery": "select TABLE_CATALOG, TABLE_SCHEMA, TABLE_NAME, TABLE_TYPE, `ENGINE`, VERSION, `ROW_FORMAT`, TABLE_ROWS, `AVG_ROW_LENGTH`, DATA_LENGTH, MAX_DATA_LENGTH, INDEX_LENGTH, DATA_FREE, `AUTO_INCREMENT`, CREATE_TIME, UPDATE_TIME, CHECK_TIME, TABLE_COLLATION, `CHECKSUM`, CREATE_OPTIONS, TABLE_COMMENT from INFORMATION_SCHEMA.`TABLES` where 1 != 1",
"Query": "select TABLE_CATALOG, TABLE_SCHEMA, TABLE_NAME, TABLE_TYPE, `ENGINE`, VERSION, `ROW_FORMAT`, TABLE_ROWS, `AVG_ROW_LENGTH`, DATA_LENGTH, MAX_DATA_LENGTH, INDEX_LENGTH, DATA_FREE, `AUTO_INCREMENT`, CREATE_TIME, UPDATE_TIME, CHECK_TIME, TABLE_COLLATION, `CHECKSUM`, CREATE_OPTIONS, TABLE_COMMENT from INFORMATION_SCHEMA.`TABLES` where TABLE_SCHEMA = :__vtschemaname /* VARCHAR */",
"Query": "select TABLE_CATALOG, TABLE_SCHEMA, TABLE_NAME, TABLE_TYPE, `ENGINE`, VERSION, `ROW_FORMAT`, TABLE_ROWS, `AVG_ROW_LENGTH`, DATA_LENGTH, MAX_DATA_LENGTH, INDEX_LENGTH, DATA_FREE, `AUTO_INCREMENT`, CREATE_TIME, UPDATE_TIME, CHECK_TIME, TABLE_COLLATION, `CHECKSUM`, CREATE_OPTIONS, TABLE_COMMENT from INFORMATION_SCHEMA.`TABLES` where TABLE_SCHEMA = :__vtschemaname /* VARCHAR */ and TABLE_SCHEMA = :__vtschemaname /* VARCHAR */",
"SysTableTableSchema": "[VARCHAR(\"user\"), VARCHAR(\"main\")]",
"Table": "INFORMATION_SCHEMA.`TABLES`"
}
Expand Down Expand Up @@ -1323,7 +1323,7 @@
"Sharded": false
},
"FieldQuery": "select 1 as found from information_schema.`tables` where 1 != 1",
"Query": "select 1 as found from information_schema.`tables` where table_schema = :__vtschemaname /* VARCHAR */",
"Query": "select 1 as found from information_schema.`tables` where table_schema = :__vtschemaname /* VARCHAR */ and table_schema = :__vtschemaname /* VARCHAR */",
"SysTableTableSchema": "[VARCHAR(\"music\"), VARCHAR(\"Music\")]",
"Table": "information_schema.`tables`"
},
Expand All @@ -1335,7 +1335,7 @@
"Sharded": false
},
"FieldQuery": "select 1 as found from information_schema.views where 1 != 1",
"Query": "select 1 as found from information_schema.views where table_schema = :__vtschemaname /* VARCHAR */ limit 1",
"Query": "select 1 as found from information_schema.views where table_schema = :__vtschemaname /* VARCHAR */ and table_schema = :__vtschemaname /* VARCHAR */ limit 1",
"SysTableTableSchema": "[VARCHAR(\"music\"), VARCHAR(\"user\")]",
"Table": "information_schema.views"
}
Expand All @@ -1353,7 +1353,7 @@
"Sharded": false
},
"FieldQuery": "select 1 as found from information_schema.`tables` where 1 != 1 union all (select 1 as found from information_schema.views where 1 != 1)",
"Query": "select 1 as found from information_schema.`tables` where table_schema = :__vtschemaname /* VARCHAR */ union all (select 1 as found from information_schema.views where table_schema = :__vtschemaname /* VARCHAR */ limit 1)",
"Query": "select 1 as found from information_schema.`tables` where table_schema = :__vtschemaname /* VARCHAR */ and table_schema = :__vtschemaname /* VARCHAR */ union all (select 1 as found from information_schema.views where table_schema = :__vtschemaname /* VARCHAR */ and table_schema = :__vtschemaname /* VARCHAR */ limit 1)",
"SysTableTableSchema": "[VARCHAR(\"music\"), VARCHAR(\"Music\"), VARCHAR(\"music\"), VARCHAR(\"user\")]",
"Table": "information_schema.`tables`"
}
Expand All @@ -1376,7 +1376,7 @@
"Sharded": false
},
"FieldQuery": "select 1 as found from information_schema.`tables` where 1 != 1",
"Query": "select 1 as found from information_schema.`tables` where table_schema = :__vtschemaname /* VARCHAR */",
"Query": "select 1 as found from information_schema.`tables` where table_schema = :__vtschemaname /* VARCHAR */ and table_schema = :__vtschemaname /* VARCHAR */",
"SysTableTableSchema": "[VARCHAR(\"music\"), VARCHAR(\"Music\")]",
"Table": "information_schema.`tables`"
},
Expand All @@ -1388,7 +1388,7 @@
"Sharded": false
},
"FieldQuery": "select 1 as found from information_schema.views where 1 != 1",
"Query": "select 1 as found from information_schema.views where table_schema = :__vtschemaname /* VARCHAR */ limit 1",
"Query": "select 1 as found from information_schema.views where table_schema = :__vtschemaname /* VARCHAR */ and table_schema = :__vtschemaname /* VARCHAR */ limit 1",
"SysTableTableSchema": "[VARCHAR(\"music\"), VARCHAR(\"user\")]",
"Table": "information_schema.views"
}
Expand All @@ -1406,7 +1406,7 @@
"Sharded": false
},
"FieldQuery": "select 1 as found from information_schema.`tables` where 1 != 1 union all (select 1 as found from information_schema.views where 1 != 1)",
"Query": "select 1 as found from information_schema.`tables` where table_schema = :__vtschemaname /* VARCHAR */ union all (select 1 as found from information_schema.views where table_schema = :__vtschemaname /* VARCHAR */ limit 1)",
"Query": "select 1 as found from information_schema.`tables` where table_schema = :__vtschemaname /* VARCHAR */ and table_schema = :__vtschemaname /* VARCHAR */ union all (select 1 as found from information_schema.views where table_schema = :__vtschemaname /* VARCHAR */ and table_schema = :__vtschemaname /* VARCHAR */ limit 1)",
"SysTableTableSchema": "[VARCHAR(\"music\"), VARCHAR(\"Music\"), VARCHAR(\"music\"), VARCHAR(\"user\")]",
"Table": "information_schema.`tables`"
}
Expand Down

0 comments on commit 4ae54f9

Please sign in to comment.