diff --git a/changelog/23.0/23.0.0/summary.md b/changelog/23.0/23.0.0/summary.md index bce142f507b..5a50e326d78 100644 --- a/changelog/23.0/23.0.0/summary.md +++ b/changelog/23.0/23.0.0/summary.md @@ -2,12 +2,25 @@ ### Table of Contents - **[Minor Changes](#minor-changes)** + - **[Deletions](#deletions)** + - [Metrics](#deleted-metrics) - **[VTTablet](#minor-changes-vttablet)** - [CLI Flags](#flags-vttablet) - [Managed MySQL configuration defaults to caching-sha2-password](#mysql-caching-sha2-password) ## Minor Changes +### Deletions + +#### Metrics + +| Component | Metric Name | Was Deprecated In | Deprecation PR | +|:---------:|:-------------------------:|:-----------------:|:-------------------------------------------------------:| +| `vtgate` | `QueriesProcessed` | `v22.0.0` | [#17727](https://github.com/vitessio/vitess/pull/17727) | +| `vtgate` | `QueriesRouted` | `v22.0.0` | [#17727](https://github.com/vitessio/vitess/pull/17727) | +| `vtgate` | `QueriesProcessedByTable` | `v22.0.0` | [#17727](https://github.com/vitessio/vitess/pull/17727) | +| `vtgate` | `QueriesRoutedByTable` | `v22.0.0` | [#17727](https://github.com/vitessio/vitess/pull/17727) | + ### VTTablet #### CLI Flags diff --git a/go/test/endtoend/vtgate/queries/misc/join_output1.json b/go/test/endtoend/vtgate/queries/misc/join_output1.json new file mode 100644 index 00000000000..f3ec05530f5 --- /dev/null +++ b/go/test/endtoend/vtgate/queries/misc/join_output1.json @@ -0,0 +1,34 @@ +{ + "OperatorType": "Join", + "Variant": "Join", + "JoinColumnIndexes": "L:0,L:1,R:0", + "JoinVars": { + "tbl_nonunq_col": 1 + }, + "Inputs": [ + { + "OperatorType": "Route", + "Variant": "Scatter", + "Keyspace": { + "Name": "ks_misc", + "Sharded": true + }, + "FieldQuery": "select tbl.unq_col, tbl.nonunq_col from tbl where 1 != 1", + "Query": "select tbl.unq_col, tbl.nonunq_col from tbl" + }, + { + "OperatorType": "Route", + "Variant": "EqualUnique", + "Keyspace": { + "Name": "ks_misc", + "Sharded": true + }, + "FieldQuery": "select t1.id2 from t1 where 1 != 1", + "Query": "select t1.id2 from t1 where t1.id1 = :tbl_nonunq_col /* INT64 */", + "Values": [ + ":tbl_nonunq_col" + ], + "Vindex": "hash" + } + ] +} \ No newline at end of file diff --git a/go/test/endtoend/vtgate/queries/misc/join_output2.json b/go/test/endtoend/vtgate/queries/misc/join_output2.json new file mode 100644 index 00000000000..b9085627565 --- /dev/null +++ b/go/test/endtoend/vtgate/queries/misc/join_output2.json @@ -0,0 +1,58 @@ +{ + "OperatorType": "Join", + "Variant": "Join", + "JoinColumnIndexes": "R:0,R:1,L:0", + "JoinVars": { + "t1_id1": 1 + }, + "Inputs": [ + { + "OperatorType": "Route", + "Variant": "Scatter", + "Keyspace": { + "Name": "ks_misc", + "Sharded": true + }, + "FieldQuery": "select t1.id2, t1.id1 from t1 where 1 != 1", + "Query": "select t1.id2, t1.id1 from t1" + }, + { + "OperatorType": "VindexLookup", + "Variant": "Equal", + "Keyspace": { + "Name": "ks_misc", + "Sharded": true + }, + "Values": [ + ":t1_id1" + ], + "Vindex": "nonunq_vdx", + "Inputs": [ + { + "OperatorType": "Route", + "Variant": "IN", + "Keyspace": { + "Name": "ks_misc", + "Sharded": true + }, + "FieldQuery": "select nonunq_col, keyspace_id from nonunq_idx where 1 != 1", + "Query": "select nonunq_col, keyspace_id from nonunq_idx where nonunq_col in ::__vals", + "Values": [ + "::nonunq_col" + ], + "Vindex": "hash" + }, + { + "OperatorType": "Route", + "Variant": "ByDestination", + "Keyspace": { + "Name": "ks_misc", + "Sharded": true + }, + "FieldQuery": "select tbl.unq_col, tbl.nonunq_col from tbl where 1 != 1", + "Query": "select tbl.unq_col, tbl.nonunq_col from tbl where tbl.nonunq_col = :t1_id1 /* INT64 */" + } + ] + } + ] +} \ No newline at end of file diff --git a/go/test/endtoend/vtgate/queries/misc/misc_test.go b/go/test/endtoend/vtgate/queries/misc/misc_test.go index ad01d4e153d..b2c2913cc00 100644 --- a/go/test/endtoend/vtgate/queries/misc/misc_test.go +++ b/go/test/endtoend/vtgate/queries/misc/misc_test.go @@ -19,6 +19,7 @@ package misc import ( "context" "database/sql" + _ "embed" "fmt" "strings" "testing" @@ -645,6 +646,12 @@ func TestAlterTableWithView(t *testing.T) { mcmp.AssertMatches("select * from v1", `[[INT64(1) INT64(1)]]`) } +//go:embed join_output1.json +var expJoinOutput1 string + +//go:embed join_output2.json +var expJoinOutput2 string + // TestStraightJoin tests that Vitess respects the ordering of join in a STRAIGHT JOIN query. func TestStraightJoin(t *testing.T) { mcmp, closer := start(t) @@ -659,7 +666,8 @@ func TestStraightJoin(t *testing.T) { // Verify that in a normal join query, vitess joins tbl with t1. res, err := mcmp.VtConn.ExecuteFetch("vexplain plan select tbl.unq_col, tbl.nonunq_col, t1.id2 from t1 join tbl where t1.id1 = tbl.nonunq_col", 100, false) require.NoError(t, err) - require.Contains(t, fmt.Sprintf("%v", res.Rows), "tbl_t1") + require.Len(t, res.Rows, 1) + require.JSONEq(t, expJoinOutput1, res.Rows[0][0].ToString()) // Test the same query with a straight join mcmp.AssertMatchesNoOrder("select tbl.unq_col, tbl.nonunq_col, t1.id2 from t1 straight_join tbl where t1.id1 = tbl.nonunq_col", @@ -668,7 +676,8 @@ func TestStraightJoin(t *testing.T) { // Verify that in a straight join query, vitess joins t1 with tbl. res, err = mcmp.VtConn.ExecuteFetch("vexplain plan select tbl.unq_col, tbl.nonunq_col, t1.id2 from t1 straight_join tbl where t1.id1 = tbl.nonunq_col", 100, false) require.NoError(t, err) - require.Contains(t, fmt.Sprintf("%v", res.Rows), "t1_tbl") + require.Len(t, res.Rows, 1) + require.JSONEq(t, expJoinOutput2, res.Rows[0][0].ToString()) } func TestFailingOuterJoinInOLAP(t *testing.T) { diff --git a/go/vt/vtgate/endtoend/vstream_test.go b/go/vt/vtgate/endtoend/vstream_test.go index 8fed95f5d51..ae55dfe8f96 100644 --- a/go/vt/vtgate/endtoend/vstream_test.go +++ b/go/vt/vtgate/endtoend/vstream_test.go @@ -775,7 +775,7 @@ recvLoop: // The last response, when the vstream copy completes, does not // typically contain ROW events. if beginEventSeen || commitEventSeen { - require.True(t, (beginEventSeen && commitEventSeen), "did not receive both BEGIN and COMMIT events in the final ROW event set") + require.True(t, beginEventSeen && commitEventSeen, "did not receive both BEGIN and COMMIT events in the final ROW event set") } } diff --git a/go/vt/vtgate/engine/cached_size.go b/go/vt/vtgate/engine/cached_size.go index 840f221b1fd..bdbef299999 100644 --- a/go/vt/vtgate/engine/cached_size.go +++ b/go/vt/vtgate/engine/cached_size.go @@ -967,12 +967,10 @@ func (cached *Route) CachedSize(alloc bool) int64 { } size := int64(0) if alloc { - size += int64(112) + size += int64(96) } // field Query string size += hack.RuntimeAllocSize(int64(len(cached.Query))) - // field TableName string - size += hack.RuntimeAllocSize(int64(len(cached.TableName))) // field FieldQuery string size += hack.RuntimeAllocSize(int64(len(cached.FieldQuery))) // field OrderBy vitess.io/vitess/go/vt/vtgate/evalengine.Comparison diff --git a/go/vt/vtgate/engine/concatenate.go b/go/vt/vtgate/engine/concatenate.go index eb93711eed2..e74d47df6a6 100644 --- a/go/vt/vtgate/engine/concatenate.go +++ b/go/vt/vtgate/engine/concatenate.go @@ -56,36 +56,6 @@ func NewConcatenate(Sources []Primitive, ignoreCols []int) *Concatenate { } } -// RouteType returns a description of the query routing type used by the primitive -func (c *Concatenate) RouteType() string { - return "Concatenate" -} - -// GetKeyspaceName specifies the Keyspace that this primitive routes to -func (c *Concatenate) GetKeyspaceName() string { - res := c.Sources[0].GetKeyspaceName() - for i := 1; i < len(c.Sources); i++ { - res = formatTwoOptionsNicely(res, c.Sources[i].GetKeyspaceName()) - } - return res -} - -// GetTableName specifies the table that this primitive routes to. -func (c *Concatenate) GetTableName() string { - res := c.Sources[0].GetTableName() - for i := 1; i < len(c.Sources); i++ { - res = formatTwoOptionsNicely(res, c.Sources[i].GetTableName()) - } - return res -} - -func formatTwoOptionsNicely(a, b string) string { - if a == b { - return a - } - return a + "_" + b -} - // errWrongNumberOfColumnsInSelect is an error var errWrongNumberOfColumnsInSelect = vterrors.NewErrorf(vtrpcpb.Code_FAILED_PRECONDITION, vterrors.WrongNumberOfColumnsInSelect, "The used SELECT statements have a different number of columns") @@ -480,5 +450,5 @@ func (c *Concatenate) Inputs() ([]Primitive, []map[string]any) { } func (c *Concatenate) description() PrimitiveDescription { - return PrimitiveDescription{OperatorType: c.RouteType()} + return PrimitiveDescription{OperatorType: "Concatenate"} } diff --git a/go/vt/vtgate/engine/dbddl.go b/go/vt/vtgate/engine/dbddl.go index 27ae6c6a254..4417e1d3dba 100644 --- a/go/vt/vtgate/engine/dbddl.go +++ b/go/vt/vtgate/engine/dbddl.go @@ -78,24 +78,13 @@ func NewDBDDL(dbName string, create bool, timeout int) *DBDDL { } } -// RouteType implements the Primitive interface -func (c *DBDDL) RouteType() string { +func (c *DBDDL) routeType() string { if c.create { return "CreateDB" } return "DropDB" } -// GetKeyspaceName implements the Primitive interface -func (c *DBDDL) GetKeyspaceName() string { - return c.name -} - -// GetTableName implements the Primitive interface -func (c *DBDDL) GetTableName() string { - return "" -} - // TryExecute implements the Primitive interface func (c *DBDDL) TryExecute(ctx context.Context, vcursor VCursor, bindVars map[string]*querypb.BindVariable, wantfields bool) (*sqltypes.Result, error) { name := vcursor.GetDBDDLPluginName() @@ -199,7 +188,7 @@ func (c *DBDDL) GetFields(context.Context, VCursor, map[string]*querypb.BindVari // description implements the Primitive interface func (c *DBDDL) description() PrimitiveDescription { return PrimitiveDescription{ - OperatorType: strings.ToUpper(c.RouteType()), + OperatorType: strings.ToUpper(c.routeType()), Keyspace: &vindexes.Keyspace{Name: c.name}, } } diff --git a/go/vt/vtgate/engine/ddl.go b/go/vt/vtgate/engine/ddl.go index 0eecbe50cdb..46f5490fdc6 100644 --- a/go/vt/vtgate/engine/ddl.go +++ b/go/vt/vtgate/engine/ddl.go @@ -62,21 +62,6 @@ func (ddl *DDL) description() PrimitiveDescription { } } -// RouteType implements the Primitive interface -func (ddl *DDL) RouteType() string { - return "DDL" -} - -// GetKeyspaceName implements the Primitive interface -func (ddl *DDL) GetKeyspaceName() string { - return ddl.Keyspace.Name -} - -// GetTableName implements the Primitive interface -func (ddl *DDL) GetTableName() string { - return ddl.DDL.GetTable().Name.String() -} - // IsOnlineSchemaDDL returns true if the query is an online schema change DDL func (ddl *DDL) isOnlineSchemaDDL() bool { switch ddl.DDL.GetAction() { diff --git a/go/vt/vtgate/engine/delete.go b/go/vt/vtgate/engine/delete.go index f20f70ba187..32566c56d6c 100644 --- a/go/vt/vtgate/engine/delete.go +++ b/go/vt/vtgate/engine/delete.go @@ -121,7 +121,6 @@ func (del *Delete) isVindexModified() bool { func (del *Delete) description() PrimitiveDescription { other := map[string]any{ "Query": del.Query, - "Table": del.GetTableName(), "OwnedVindexQuery": del.OwnedVindexQuery, "MultiShardAutocommit": del.MultiShardAutocommit, "QueryTimeout": del.QueryTimeout, diff --git a/go/vt/vtgate/engine/distinct.go b/go/vt/vtgate/engine/distinct.go index 189440611c3..4ba4231db66 100644 --- a/go/vt/vtgate/engine/distinct.go +++ b/go/vt/vtgate/engine/distinct.go @@ -156,21 +156,6 @@ func (d *Distinct) TryStreamExecute(ctx context.Context, vcursor VCursor, bindVa return err } -// RouteType implements the Primitive interface -func (d *Distinct) RouteType() string { - return d.Source.RouteType() -} - -// GetKeyspaceName implements the Primitive interface -func (d *Distinct) GetKeyspaceName() string { - return d.Source.GetKeyspaceName() -} - -// GetTableName implements the Primitive interface -func (d *Distinct) GetTableName() string { - return d.Source.GetTableName() -} - // GetFields implements the Primitive interface func (d *Distinct) GetFields(ctx context.Context, vcursor VCursor, bindVars map[string]*querypb.BindVariable) (*sqltypes.Result, error) { return d.Source.GetFields(ctx, vcursor, bindVars) diff --git a/go/vt/vtgate/engine/dml.go b/go/vt/vtgate/engine/dml.go index 31fc1a2d88e..a52e075f08a 100644 --- a/go/vt/vtgate/engine/dml.go +++ b/go/vt/vtgate/engine/dml.go @@ -19,8 +19,6 @@ package engine import ( "context" "fmt" - "sort" - "strings" "vitess.io/vitess/go/sqltypes" "vitess.io/vitess/go/vt/key" @@ -99,30 +97,6 @@ func (dml *DML) execMultiDestination(ctx context.Context, primitive Primitive, v return dml.execMultiShard(ctx, primitive, vcursor, rss, queries) } -// RouteType returns a description of the query routing type used by the primitive -func (dml *DML) RouteType() string { - return dml.Opcode.String() -} - -// GetKeyspaceName specifies the Keyspace that this primitive routes to. -func (dml *DML) GetKeyspaceName() string { - return dml.Keyspace.Name -} - -// GetTableName specifies the table that this primitive routes to. -func (dml *DML) GetTableName() string { - sort.Strings(dml.TableNames) - var tableNames []string - var previousTbl string - for _, name := range dml.TableNames { - if name != previousTbl { - tableNames = append(tableNames, name) - previousTbl = name - } - } - return strings.Join(tableNames, ", ") -} - func allowOnlyPrimary(rss ...*srvtopo.ResolvedShard) error { for _, rs := range rss { if rs != nil && rs.Target.TabletType != topodatapb.TabletType_PRIMARY { diff --git a/go/vt/vtgate/engine/dml_with_input.go b/go/vt/vtgate/engine/dml_with_input.go index 0128841526e..588879c7be6 100644 --- a/go/vt/vtgate/engine/dml_with_input.go +++ b/go/vt/vtgate/engine/dml_with_input.go @@ -40,18 +40,6 @@ type DMLWithInput struct { BVList []map[string]int } -func (dml *DMLWithInput) RouteType() string { - return "DMLWithInput" -} - -func (dml *DMLWithInput) GetKeyspaceName() string { - return dml.Input.GetKeyspaceName() -} - -func (dml *DMLWithInput) GetTableName() string { - return dml.Input.GetTableName() -} - func (dml *DMLWithInput) Inputs() ([]Primitive, []map[string]any) { return append([]Primitive{dml.Input}, dml.DMLs...), nil } diff --git a/go/vt/vtgate/engine/exec_prepared_statement.go b/go/vt/vtgate/engine/exec_prepared_statement.go index 1874350f7db..a6a2bb68b16 100644 --- a/go/vt/vtgate/engine/exec_prepared_statement.go +++ b/go/vt/vtgate/engine/exec_prepared_statement.go @@ -37,18 +37,6 @@ func (e *ExecStmt) NeedsTransaction() bool { return e.Input.NeedsTransaction() } -func (e *ExecStmt) RouteType() string { - return "EXECUTE" -} - -func (e *ExecStmt) GetKeyspaceName() string { - return e.Input.GetKeyspaceName() -} - -func (e *ExecStmt) GetTableName() string { - return e.Input.GetTableName() -} - func (e *ExecStmt) GetFields(ctx context.Context, vcursor VCursor, bindVars map[string]*querypb.BindVariable) (*sqltypes.Result, error) { return nil, vterrors.VT12001("prepare command on execute statement") } @@ -73,7 +61,7 @@ func (e *ExecStmt) description() PrimitiveDescription { params = append(params, p.Name.Lowered()) } return PrimitiveDescription{ - OperatorType: e.RouteType(), + OperatorType: "EXECUTE", Other: map[string]any{ "Parameters": params, }, diff --git a/go/vt/vtgate/engine/fake_primitive_test.go b/go/vt/vtgate/engine/fake_primitive_test.go index bddbca87664..465dd78ccf6 100644 --- a/go/vt/vtgate/engine/fake_primitive_test.go +++ b/go/vt/vtgate/engine/fake_primitive_test.go @@ -61,18 +61,6 @@ func (f *fakePrimitive) rewind() { f.log = nil } -func (f *fakePrimitive) RouteType() string { - return "Fake" -} - -func (f *fakePrimitive) GetKeyspaceName() string { - return "fakeKs" -} - -func (f *fakePrimitive) GetTableName() string { - return "fakeTable" -} - func (f *fakePrimitive) TryExecute(ctx context.Context, vcursor VCursor, bindVars map[string]*querypb.BindVariable, wantfields bool) (*sqltypes.Result, error) { if f.useNewPrintBindVars { f.log = append(f.log, fmt.Sprintf("Execute %v %v", printBindVars(bindVars), wantfields)) diff --git a/go/vt/vtgate/engine/filter.go b/go/vt/vtgate/engine/filter.go index dc7af1acfeb..d0139ef2119 100644 --- a/go/vt/vtgate/engine/filter.go +++ b/go/vt/vtgate/engine/filter.go @@ -39,21 +39,6 @@ type Filter struct { Truncate int } -// RouteType returns a description of the query routing type used by the primitive -func (f *Filter) RouteType() string { - return f.Input.RouteType() -} - -// GetKeyspaceName specifies the Keyspace that this primitive routes to. -func (f *Filter) GetKeyspaceName() string { - return f.Input.GetKeyspaceName() -} - -// GetTableName specifies the table that this primitive routes to. -func (f *Filter) GetTableName() string { - return f.Input.GetTableName() -} - // TryExecute satisfies the Primitive interface. func (f *Filter) TryExecute(ctx context.Context, vcursor VCursor, bindVars map[string]*querypb.BindVariable, wantfields bool) (*sqltypes.Result, error) { result, err := vcursor.ExecutePrimitive(ctx, f.Input, bindVars, wantfields) diff --git a/go/vt/vtgate/engine/fk_cascade.go b/go/vt/vtgate/engine/fk_cascade.go index b73ab15546b..7e580bac67c 100644 --- a/go/vt/vtgate/engine/fk_cascade.go +++ b/go/vt/vtgate/engine/fk_cascade.go @@ -62,21 +62,6 @@ type FkCascade struct { Parent Primitive } -// RouteType implements the Primitive interface. -func (fkc *FkCascade) RouteType() string { - return "FkCascade" -} - -// GetKeyspaceName implements the Primitive interface. -func (fkc *FkCascade) GetKeyspaceName() string { - return fkc.Parent.GetKeyspaceName() -} - -// GetTableName implements the Primitive interface. -func (fkc *FkCascade) GetTableName() string { - return fkc.Parent.GetTableName() -} - // TryExecute implements the Primitive interface. func (fkc *FkCascade) TryExecute(ctx context.Context, vcursor VCursor, bindVars map[string]*querypb.BindVariable, wantfields bool) (*sqltypes.Result, error) { // Execute the Selection primitive to find the rows that are going to modified. @@ -226,7 +211,7 @@ func (fkc *FkCascade) Inputs() ([]Primitive, []map[string]any) { } func (fkc *FkCascade) description() PrimitiveDescription { - return PrimitiveDescription{OperatorType: fkc.RouteType()} + return PrimitiveDescription{OperatorType: "FkCascade"} } var _ Primitive = (*FkCascade)(nil) diff --git a/go/vt/vtgate/engine/fk_verify.go b/go/vt/vtgate/engine/fk_verify.go index da850f7a366..d5b64e00a5f 100644 --- a/go/vt/vtgate/engine/fk_verify.go +++ b/go/vt/vtgate/engine/fk_verify.go @@ -48,21 +48,6 @@ const ( ChildVerify = "VerifyChild" ) -// RouteType implements the Primitive interface -func (f *FkVerify) RouteType() string { - return "FKVerify" -} - -// GetKeyspaceName implements the Primitive interface -func (f *FkVerify) GetKeyspaceName() string { - return f.Exec.GetKeyspaceName() -} - -// GetTableName implements the Primitive interface -func (f *FkVerify) GetTableName() string { - return f.Exec.GetTableName() -} - // TryExecute implements the Primitive interface func (f *FkVerify) TryExecute(ctx context.Context, vcursor VCursor, bindVars map[string]*querypb.BindVariable, wantfields bool) (*sqltypes.Result, error) { for _, v := range f.Verify { @@ -105,7 +90,7 @@ func (f *FkVerify) Inputs() ([]Primitive, []map[string]any) { } func (f *FkVerify) description() PrimitiveDescription { - return PrimitiveDescription{OperatorType: f.RouteType()} + return PrimitiveDescription{OperatorType: "FKVerify"} } var _ Primitive = (*FkVerify)(nil) diff --git a/go/vt/vtgate/engine/hash_join.go b/go/vt/vtgate/engine/hash_join.go index 6b9425a35d1..0b74eea16ba 100644 --- a/go/vt/vtgate/engine/hash_join.go +++ b/go/vt/vtgate/engine/hash_join.go @@ -201,24 +201,6 @@ func (hj *HashJoin) TryStreamExecute(ctx context.Context, vcursor VCursor, bindV return nil } -// RouteType implements the Primitive interface -func (hj *HashJoin) RouteType() string { - return "HashJoin" -} - -// GetKeyspaceName implements the Primitive interface -func (hj *HashJoin) GetKeyspaceName() string { - if hj.Left.GetKeyspaceName() == hj.Right.GetKeyspaceName() { - return hj.Left.GetKeyspaceName() - } - return hj.Left.GetKeyspaceName() + "_" + hj.Right.GetKeyspaceName() -} - -// GetTableName implements the Primitive interface -func (hj *HashJoin) GetTableName() string { - return hj.Left.GetTableName() + "_" + hj.Right.GetTableName() -} - // GetFields implements the Primitive interface func (hj *HashJoin) GetFields(ctx context.Context, vcursor VCursor, bindVars map[string]*querypb.BindVariable) (*sqltypes.Result, error) { joinVars := make(map[string]*querypb.BindVariable) @@ -248,7 +230,6 @@ func (hj *HashJoin) Inputs() ([]Primitive, []map[string]any) { // description implements the Primitive interface func (hj *HashJoin) description() PrimitiveDescription { other := map[string]any{ - "TableName": hj.GetTableName(), "JoinColumnIndexes": strings.Trim(strings.Join(strings.Fields(fmt.Sprint(hj.Cols)), ","), "[]"), "Predicate": sqlparser.String(hj.ASTPred), "ComparisonType": hj.ComparisonType.String(), diff --git a/go/vt/vtgate/engine/insert.go b/go/vt/vtgate/engine/insert.go index 74b0e954fe9..1688152c01d 100644 --- a/go/vt/vtgate/engine/insert.go +++ b/go/vt/vtgate/engine/insert.go @@ -104,11 +104,6 @@ func newInsert( return ins } -// RouteType returns a description of the query routing type used by the primitive -func (ins *Insert) RouteType() string { - return insName[ins.Opcode] -} - // TryExecute performs a non-streaming exec. func (ins *Insert) TryExecute(ctx context.Context, vcursor VCursor, bindVars map[string]*querypb.BindVariable, _ bool) (*sqltypes.Result, error) { switch ins.Opcode { @@ -347,7 +342,6 @@ func (ins *Insert) buildVindexRowsValues(ctx context.Context, vcursor VCursor, b func (ins *Insert) description() PrimitiveDescription { other := ins.commonDesc() other["Query"] = ins.Query - other["TableName"] = ins.GetTableName() if len(ins.VindexValues) > 0 { valuesOffsets := map[string]string{} diff --git a/go/vt/vtgate/engine/insert_common.go b/go/vt/vtgate/engine/insert_common.go index e325ab7b6cc..bdf3688fa5b 100644 --- a/go/vt/vtgate/engine/insert_common.go +++ b/go/vt/vtgate/engine/insert_common.go @@ -134,16 +134,6 @@ func (code InsertOpcode) MarshalJSON() ([]byte, error) { return json.Marshal(insName[code]) } -// GetKeyspaceName specifies the Keyspace that this primitive routes to. -func (ic *InsertCommon) GetKeyspaceName() string { - return ic.Keyspace.Name -} - -// GetTableName specifies the table that this primitive routes to. -func (ic *InsertCommon) GetTableName() string { - return ic.TableName -} - func (ins *InsertCommon) executeUnshardedTableQuery(ctx context.Context, vcursor VCursor, loggingPrimitive Primitive, bindVars map[string]*querypb.BindVariable, query string, insertID uint64) (*sqltypes.Result, error) { rss, _, err := vcursor.ResolveDestinations(ctx, ins.Keyspace.Name, nil, []key.ShardDestination{key.DestinationAllShards{}}) if err != nil { diff --git a/go/vt/vtgate/engine/insert_select.go b/go/vt/vtgate/engine/insert_select.go index 4ccbb5cc071..4a0feddfa7b 100644 --- a/go/vt/vtgate/engine/insert_select.go +++ b/go/vt/vtgate/engine/insert_select.go @@ -86,11 +86,6 @@ func (ins *InsertSelect) Inputs() ([]Primitive, []map[string]any) { return []Primitive{ins.Input}, nil } -// RouteType returns a description of the query routing type used by the primitive -func (ins *InsertSelect) RouteType() string { - return "InsertSelect" -} - // TryExecute performs a non-streaming exec. func (ins *InsertSelect) TryExecute(ctx context.Context, vcursor VCursor, bindVars map[string]*querypb.BindVariable, _ bool) (*sqltypes.Result, error) { if ins.Keyspace.Sharded { @@ -319,7 +314,6 @@ func (ins *InsertSelect) execInsertSharded(ctx context.Context, vcursor VCursor, func (ins *InsertSelect) description() PrimitiveDescription { other := ins.commonDesc() - other["TableName"] = ins.GetTableName() if len(ins.VindexValueOffset) > 0 { valuesOffsets := map[string]string{} diff --git a/go/vt/vtgate/engine/join.go b/go/vt/vtgate/engine/join.go index 91900330be3..9599b987a67 100644 --- a/go/vt/vtgate/engine/join.go +++ b/go/vt/vtgate/engine/join.go @@ -273,24 +273,6 @@ func (code JoinOpcode) MarshalJSON() ([]byte, error) { return ([]byte)(fmt.Sprintf("\"%s\"", code.String())), nil } -// RouteType returns a description of the query routing type used by the primitive -func (jn *Join) RouteType() string { - return "Join" -} - -// GetKeyspaceName specifies the Keyspace that this primitive routes to. -func (jn *Join) GetKeyspaceName() string { - if jn.Left.GetKeyspaceName() == jn.Right.GetKeyspaceName() { - return jn.Left.GetKeyspaceName() - } - return jn.Left.GetKeyspaceName() + "_" + jn.Right.GetKeyspaceName() -} - -// GetTableName specifies the table that this primitive routes to. -func (jn *Join) GetTableName() string { - return jn.Left.GetTableName() + "_" + jn.Right.GetTableName() -} - // NeedsTransaction implements the Primitive interface func (jn *Join) NeedsTransaction() bool { return jn.Right.NeedsTransaction() || jn.Left.NeedsTransaction() @@ -309,7 +291,6 @@ func combineVars(bv1, bv2 map[string]*querypb.BindVariable) map[string]*querypb. func (jn *Join) description() PrimitiveDescription { other := map[string]any{ - "TableName": jn.GetTableName(), "JoinColumnIndexes": jn.joinColsDescription(), } if len(jn.Vars) > 0 { diff --git a/go/vt/vtgate/engine/join_values.go b/go/vt/vtgate/engine/join_values.go index 7b4fc19e908..bf09c14d74c 100644 --- a/go/vt/vtgate/engine/join_values.go +++ b/go/vt/vtgate/engine/join_values.go @@ -115,24 +115,6 @@ func (jv *ValuesJoin) Inputs() ([]Primitive, []map[string]any) { return []Primitive{jv.Left, jv.Right}, nil } -// RouteType returns a description of the query routing type used by the primitive -func (jv *ValuesJoin) RouteType() string { - return "ValuesJoin" -} - -// GetKeyspaceName specifies the Keyspace that this primitive routes to. -func (jv *ValuesJoin) GetKeyspaceName() string { - if jv.Left.GetKeyspaceName() == jv.Right.GetKeyspaceName() { - return jv.Left.GetKeyspaceName() - } - return jv.Left.GetKeyspaceName() + "_" + jv.Right.GetKeyspaceName() -} - -// GetTableName specifies the table that this primitive routes to. -func (jv *ValuesJoin) GetTableName() string { - return jv.Left.GetTableName() + "_" + jv.Right.GetTableName() -} - // NeedsTransaction implements the Primitive interface func (jv *ValuesJoin) NeedsTransaction() bool { return jv.Right.NeedsTransaction() || jv.Left.NeedsTransaction() diff --git a/go/vt/vtgate/engine/limit.go b/go/vt/vtgate/engine/limit.go index d50a0d4adde..97ffef70691 100644 --- a/go/vt/vtgate/engine/limit.go +++ b/go/vt/vtgate/engine/limit.go @@ -53,21 +53,6 @@ type Limit struct { var UpperLimitStr = "__upper_limit" -// RouteType returns a description of the query routing type used by the primitive -func (l *Limit) RouteType() string { - return l.Input.RouteType() -} - -// GetKeyspaceName specifies the Keyspace that this primitive routes to. -func (l *Limit) GetKeyspaceName() string { - return l.Input.GetKeyspaceName() -} - -// GetTableName specifies the table that this primitive routes to. -func (l *Limit) GetTableName() string { - return l.Input.GetTableName() -} - // TryExecute satisfies the Primitive interface. func (l *Limit) TryExecute(ctx context.Context, vcursor VCursor, bindVars map[string]*querypb.BindVariable, wantfields bool) (*sqltypes.Result, error) { count, offset, err := l.getCountAndOffset(ctx, vcursor, bindVars) diff --git a/go/vt/vtgate/engine/lock.go b/go/vt/vtgate/engine/lock.go index 2b962a76345..1bb7c7d8733 100644 --- a/go/vt/vtgate/engine/lock.go +++ b/go/vt/vtgate/engine/lock.go @@ -57,21 +57,6 @@ type LockFunc struct { Name evalengine.Expr } -// RouteType is part of the Primitive interface -func (l *Lock) RouteType() string { - return "lock" -} - -// GetKeyspaceName is part of the Primitive interface -func (l *Lock) GetKeyspaceName() string { - return l.Keyspace.Name -} - -// GetTableName is part of the Primitive interface -func (l *Lock) GetTableName() string { - return "dual" -} - // TryExecute is part of the Primitive interface func (l *Lock) TryExecute(ctx context.Context, vcursor VCursor, bindVars map[string]*querypb.BindVariable, wantfields bool) (*sqltypes.Result, error) { return l.execLock(ctx, vcursor, bindVars) diff --git a/go/vt/vtgate/engine/memory_sort.go b/go/vt/vtgate/engine/memory_sort.go index 03e66d0d033..d15f97c0b18 100644 --- a/go/vt/vtgate/engine/memory_sort.go +++ b/go/vt/vtgate/engine/memory_sort.go @@ -44,21 +44,6 @@ type MemorySort struct { TruncateColumnCount int } -// RouteType returns a description of the query routing type used by the primitive. -func (ms *MemorySort) RouteType() string { - return ms.Input.RouteType() -} - -// GetKeyspaceName specifies the Keyspace that this primitive routes to. -func (ms *MemorySort) GetKeyspaceName() string { - return ms.Input.GetKeyspaceName() -} - -// GetTableName specifies the table that this primitive routes to. -func (ms *MemorySort) GetTableName() string { - return ms.Input.GetTableName() -} - // TryExecute satisfies the Primitive interface. func (ms *MemorySort) TryExecute(ctx context.Context, vcursor VCursor, bindVars map[string]*querypb.BindVariable, wantfields bool) (*sqltypes.Result, error) { count, err := ms.fetchCount(ctx, vcursor, bindVars) diff --git a/go/vt/vtgate/engine/merge_sort.go b/go/vt/vtgate/engine/merge_sort.go index abf2a65f311..adc894c2f7d 100644 --- a/go/vt/vtgate/engine/merge_sort.go +++ b/go/vt/vtgate/engine/merge_sort.go @@ -55,15 +55,6 @@ type MergeSort struct { FetchLastInsertID bool } -// RouteType satisfies Primitive. -func (ms *MergeSort) RouteType() string { return "MergeSort" } - -// GetKeyspaceName satisfies Primitive. -func (ms *MergeSort) GetKeyspaceName() string { return "" } - -// GetTableName satisfies Primitive. -func (ms *MergeSort) GetTableName() string { return "" } - // TryExecute is not supported. func (ms *MergeSort) TryExecute(ctx context.Context, vcursor VCursor, bindVars map[string]*querypb.BindVariable, wantfields bool) (*sqltypes.Result, error) { return nil, vterrors.Errorf(vtrpcpb.Code_INTERNAL, "[BUG] Execute is not reachable") diff --git a/go/vt/vtgate/engine/mirror.go b/go/vt/vtgate/engine/mirror.go index 6396e4b33ec..5616db7a17b 100644 --- a/go/vt/vtgate/engine/mirror.go +++ b/go/vt/vtgate/engine/mirror.go @@ -58,18 +58,6 @@ func NewPercentBasedMirror(percentage float32, primitive Primitive, target Primi return &percentBasedMirror{percent: percentage, primitive: primitive, target: target} } -func (m *percentBasedMirror) RouteType() string { - return "Mirror" -} - -func (m *percentBasedMirror) GetKeyspaceName() string { - return m.primitive.GetKeyspaceName() -} - -func (m *percentBasedMirror) GetTableName() string { - return m.primitive.GetTableName() -} - func (m *percentBasedMirror) GetFields(ctx context.Context, vcursor VCursor, bindVars map[string]*querypb.BindVariable) (*sqltypes.Result, error) { return m.primitive.GetFields(ctx, vcursor, bindVars) } diff --git a/go/vt/vtgate/engine/mstream.go b/go/vt/vtgate/engine/mstream.go index a5b1eba05e6..ac0ea546fc0 100644 --- a/go/vt/vtgate/engine/mstream.go +++ b/go/vt/vtgate/engine/mstream.go @@ -43,21 +43,6 @@ type MStream struct { TableName string } -// RouteType implements the Primitive interface -func (m *MStream) RouteType() string { - return "MStream" -} - -// GetKeyspaceName implements the Primitive interface -func (m *MStream) GetKeyspaceName() string { - return m.Keyspace.Name -} - -// GetTableName implements the Primitive interface -func (m *MStream) GetTableName() string { - return m.TableName -} - // TryExecute implements the Primitive interface func (m *MStream) TryExecute(ctx context.Context, vcursor VCursor, bindVars map[string]*querypb.BindVariable, wantfields bool) (*sqltypes.Result, error) { return nil, vterrors.VT13001("TryExecute is not supported for MStream") diff --git a/go/vt/vtgate/engine/online_ddl.go b/go/vt/vtgate/engine/online_ddl.go index 4bcbcc16c5c..6bcf56a481e 100644 --- a/go/vt/vtgate/engine/online_ddl.go +++ b/go/vt/vtgate/engine/online_ddl.go @@ -55,21 +55,6 @@ func (v *OnlineDDL) description() PrimitiveDescription { } } -// RouteType implements the Primitive interface -func (v *OnlineDDL) RouteType() string { - return "OnlineDDL" -} - -// GetKeyspaceName implements the Primitive interface -func (v *OnlineDDL) GetKeyspaceName() string { - return v.Keyspace.Name -} - -// GetTableName implements the Primitive interface -func (v *OnlineDDL) GetTableName() string { - return v.DDL.GetTable().Name.String() -} - // TryExecute implements the Primitive interface func (v *OnlineDDL) TryExecute(ctx context.Context, vcursor VCursor, bindVars map[string]*querypb.BindVariable, wantfields bool) (result *sqltypes.Result, err error) { result = &sqltypes.Result{ @@ -87,7 +72,7 @@ func (v *OnlineDDL) TryExecute(ctx context.Context, vcursor VCursor, bindVars ma // default to @@session_uuid migrationContext = fmt.Sprintf("vtgate:%s", vcursor.Session().GetSessionUUID()) } - onlineDDLs, err := schema.NewOnlineDDLs(v.GetKeyspaceName(), v.SQL, v.DDL, + onlineDDLs, err := schema.NewOnlineDDLs(v.Keyspace.Name, v.SQL, v.DDL, v.DDLStrategySetting, migrationContext, "", vcursor.Environment().Parser(), ) if err != nil { diff --git a/go/vt/vtgate/engine/ordered_aggregate.go b/go/vt/vtgate/engine/ordered_aggregate.go index 324e531c4dd..d5a51e8a70e 100644 --- a/go/vt/vtgate/engine/ordered_aggregate.go +++ b/go/vt/vtgate/engine/ordered_aggregate.go @@ -79,21 +79,6 @@ func (gbp GroupByParams) String() string { return out } -// RouteType returns a description of the query routing type used by the primitive -func (oa *OrderedAggregate) RouteType() string { - return oa.Input.RouteType() -} - -// GetKeyspaceName specifies the Keyspace that this primitive routes to. -func (oa *OrderedAggregate) GetKeyspaceName() string { - return oa.Input.GetKeyspaceName() -} - -// GetTableName specifies the table that this primitive routes to. -func (oa *OrderedAggregate) GetTableName() string { - return oa.Input.GetTableName() -} - // TryExecute is a Primitive function. func (oa *OrderedAggregate) TryExecute(ctx context.Context, vcursor VCursor, bindVars map[string]*querypb.BindVariable, _ bool) (*sqltypes.Result, error) { qr, err := oa.execute(ctx, vcursor, bindVars) diff --git a/go/vt/vtgate/engine/plan_description_test.go b/go/vt/vtgate/engine/plan_description_test.go index 9f20e37976a..61d69b0848a 100644 --- a/go/vt/vtgate/engine/plan_description_test.go +++ b/go/vt/vtgate/engine/plan_description_test.go @@ -40,7 +40,6 @@ func TestCreateRoutePlanDescription(t *testing.T) { TargetDestination: key.DestinationAllShards{}, Other: map[string]any{ "Query": route.Query, - "Table": route.GetTableName(), "FieldQuery": route.FieldQuery, "Vindex": route.Vindex.String(), }, @@ -60,7 +59,6 @@ func createRoute() *Route { Vindex: hash.(*vindexes.Hash), }, Query: "select all the things", - TableName: "tableName", FieldQuery: "more query", } } @@ -98,7 +96,6 @@ func getDescriptionFor(route *Route) PrimitiveDescription { TargetDestination: key.DestinationAllShards{}, Other: map[string]any{ "Query": route.Query, - "Table": route.GetTableName(), "FieldQuery": route.FieldQuery, "Vindex": route.Vindex.String(), }, diff --git a/go/vt/vtgate/engine/plan_switcher.go b/go/vt/vtgate/engine/plan_switcher.go index e9e10425869..05a97f1e390 100644 --- a/go/vt/vtgate/engine/plan_switcher.go +++ b/go/vt/vtgate/engine/plan_switcher.go @@ -43,24 +43,6 @@ type PlanSwitcher struct { Optimized Primitive } -func (s *PlanSwitcher) RouteType() string { - return "PlanSwitcher" -} - -func (s *PlanSwitcher) GetKeyspaceName() string { - if s.Baseline != nil { - return s.Baseline.GetKeyspaceName() - } - return s.Optimized.GetKeyspaceName() -} - -func (s *PlanSwitcher) GetTableName() string { - if s.Baseline != nil { - return s.Baseline.GetKeyspaceName() - } - return s.Optimized.GetKeyspaceName() -} - func (s *PlanSwitcher) GetFields( ctx context.Context, vcursor VCursor, @@ -131,7 +113,7 @@ func (s *PlanSwitcher) description() PrimitiveDescription { other["BaselineErr"] = s.BaselineErr.Error() } return PrimitiveDescription{ - OperatorType: s.RouteType(), + OperatorType: "PlanSwitcher", Other: other, } } diff --git a/go/vt/vtgate/engine/primitive.go b/go/vt/vtgate/engine/primitive.go index a394d391625..ce77769d38b 100644 --- a/go/vt/vtgate/engine/primitive.go +++ b/go/vt/vtgate/engine/primitive.go @@ -246,9 +246,6 @@ type ( // During execution, the Primitive's pass Result objects up the tree structure, until reaching the root, // and its result is passed to the client. Primitive interface { - RouteType() string - GetKeyspaceName() string - GetTableName() string GetFields(ctx context.Context, vcursor VCursor, bindVars map[string]*querypb.BindVariable) (*sqltypes.Result, error) NeedsTransaction() bool @@ -292,6 +289,15 @@ func Find(isMatch Match, start Primitive) Primitive { return nil } +// Visit will traverse the Primitive tree structure, calling the visitor function on each node. +func Visit(start Primitive, visitor func(node Primitive)) { + visitor(start) + inputs, _ := start.Inputs() + for _, input := range inputs { + Visit(input, visitor) + } +} + // Exists traverses recursively down the Primitive tree structure, and returns true when Match returns true func Exists(m Match, p Primitive) bool { return Find(m, p) != nil diff --git a/go/vt/vtgate/engine/projection.go b/go/vt/vtgate/engine/projection.go index 6fb75bdf800..d18608393f3 100644 --- a/go/vt/vtgate/engine/projection.go +++ b/go/vt/vtgate/engine/projection.go @@ -39,21 +39,6 @@ type Projection struct { Input Primitive } -// RouteType implements the Primitive interface -func (p *Projection) RouteType() string { - return p.Input.RouteType() -} - -// GetKeyspaceName implements the Primitive interface -func (p *Projection) GetKeyspaceName() string { - return p.Input.GetKeyspaceName() -} - -// GetTableName implements the Primitive interface -func (p *Projection) GetTableName() string { - return p.Input.GetTableName() -} - // TryExecute implements the Primitive interface func (p *Projection) TryExecute(ctx context.Context, vcursor VCursor, bindVars map[string]*querypb.BindVariable, wantfields bool) (*sqltypes.Result, error) { result, err := vcursor.ExecutePrimitive(ctx, p.Input, bindVars, wantfields) diff --git a/go/vt/vtgate/engine/recurse_cte.go b/go/vt/vtgate/engine/recurse_cte.go index f523883d280..8a636f7f632 100644 --- a/go/vt/vtgate/engine/recurse_cte.go +++ b/go/vt/vtgate/engine/recurse_cte.go @@ -115,21 +115,6 @@ func (r *RecurseCTE) recurse(ctx context.Context, vcursor VCursor, bindvars map[ return nil } -func (r *RecurseCTE) RouteType() string { - return "RecurseCTE" -} - -func (r *RecurseCTE) GetKeyspaceName() string { - if r.Seed.GetKeyspaceName() == r.Term.GetKeyspaceName() { - return r.Seed.GetKeyspaceName() - } - return r.Seed.GetKeyspaceName() + "_" + r.Term.GetKeyspaceName() -} - -func (r *RecurseCTE) GetTableName() string { - return r.Seed.GetTableName() -} - func (r *RecurseCTE) GetFields(ctx context.Context, vcursor VCursor, bindVars map[string]*querypb.BindVariable) (*sqltypes.Result, error) { return r.Seed.GetFields(ctx, vcursor, bindVars) } diff --git a/go/vt/vtgate/engine/rename_fields.go b/go/vt/vtgate/engine/rename_fields.go index 3fdab364468..959ebd5bd31 100644 --- a/go/vt/vtgate/engine/rename_fields.go +++ b/go/vt/vtgate/engine/rename_fields.go @@ -47,21 +47,6 @@ func NewRenameField(cols []string, indices []int, input Primitive) (*RenameField }, nil } -// RouteType implements the primitive interface -func (r *RenameFields) RouteType() string { - return r.Input.RouteType() -} - -// GetKeyspaceName implements the primitive interface -func (r *RenameFields) GetKeyspaceName() string { - return r.Input.GetKeyspaceName() -} - -// GetTableName implements the primitive interface -func (r *RenameFields) GetTableName() string { - return r.Input.GetTableName() -} - // TryExecute implements the Primitive interface func (r *RenameFields) TryExecute(ctx context.Context, vcursor VCursor, bindVars map[string]*querypb.BindVariable, wantfields bool) (*sqltypes.Result, error) { qr, err := vcursor.ExecutePrimitive(ctx, r.Input, bindVars, wantfields) diff --git a/go/vt/vtgate/engine/replace_variables.go b/go/vt/vtgate/engine/replace_variables.go index d3184d8756b..b0d9cf6f296 100644 --- a/go/vt/vtgate/engine/replace_variables.go +++ b/go/vt/vtgate/engine/replace_variables.go @@ -36,21 +36,6 @@ func NewReplaceVariables(input Primitive) *ReplaceVariables { return &ReplaceVariables{Input: input} } -// RouteType implements the Primitive interface -func (r *ReplaceVariables) RouteType() string { - return r.Input.RouteType() -} - -// GetKeyspaceName implements the Primitive interface -func (r *ReplaceVariables) GetKeyspaceName() string { - return r.Input.GetKeyspaceName() -} - -// GetTableName implements the Primitive interface -func (r *ReplaceVariables) GetTableName() string { - return r.Input.GetTableName() -} - // TryExecute implements the Primitive interface func (r *ReplaceVariables) TryExecute(ctx context.Context, vcursor VCursor, bindVars map[string]*querypb.BindVariable, wantfields bool) (*sqltypes.Result, error) { qr, err := vcursor.ExecutePrimitive(ctx, r.Input, bindVars, wantfields) diff --git a/go/vt/vtgate/engine/revert_migration.go b/go/vt/vtgate/engine/revert_migration.go index 7d43056fad5..e6660140349 100644 --- a/go/vt/vtgate/engine/revert_migration.go +++ b/go/vt/vtgate/engine/revert_migration.go @@ -53,21 +53,6 @@ func (v *RevertMigration) description() PrimitiveDescription { } } -// RouteType implements the Primitive interface -func (v *RevertMigration) RouteType() string { - return "RevertMigration" -} - -// GetKeyspaceName implements the Primitive interface -func (v *RevertMigration) GetKeyspaceName() string { - return v.Keyspace.Name -} - -// GetTableName implements the Primitive interface -func (v *RevertMigration) GetTableName() string { - return "" -} - // TryExecute implements the Primitive interface func (v *RevertMigration) TryExecute(ctx context.Context, vcursor VCursor, bindVars map[string]*querypb.BindVariable, wantfields bool) (result *sqltypes.Result, err error) { result = &sqltypes.Result{ @@ -85,7 +70,7 @@ func (v *RevertMigration) TryExecute(ctx context.Context, vcursor VCursor, bindV return nil, err } ddlStrategySetting.Strategy = schema.DDLStrategyOnline // and we keep the options as they were - onlineDDL, err := schema.NewOnlineDDL(v.GetKeyspaceName(), "", v.Query, ddlStrategySetting, fmt.Sprintf("vtgate:%s", vcursor.Session().GetSessionUUID()), "", vcursor.Environment().Parser()) + onlineDDL, err := schema.NewOnlineDDL(v.Keyspace.Name, "", v.Query, ddlStrategySetting, fmt.Sprintf("vtgate:%s", vcursor.Session().GetSessionUUID()), "", vcursor.Environment().Parser()) if err != nil { return result, err } diff --git a/go/vt/vtgate/engine/route.go b/go/vt/vtgate/engine/route.go index a43299961e6..fd206590d9a 100644 --- a/go/vt/vtgate/engine/route.go +++ b/go/vt/vtgate/engine/route.go @@ -60,9 +60,6 @@ type Route struct { // Query specifies the query to be executed. Query string - // TableName specifies the tables to send the query to. - TableName string - // FieldQuery specifies the query to be executed for a GetFieldInfo request. FieldQuery string @@ -110,21 +107,6 @@ var ( partialSuccessScatterQueries = stats.NewCounter("PartialSuccessScatterQueries", "Count of partially successful scatter queries") ) -// RouteType returns a description of the query routing type used by the primitive -func (route *Route) RouteType() string { - return route.Opcode.String() -} - -// GetKeyspaceName specifies the Keyspace that this primitive routes to. -func (route *Route) GetKeyspaceName() string { - return route.Keyspace.Name -} - -// GetTableName specifies the table that this primitive routes to. -func (route *Route) GetTableName() string { - return route.TableName -} - // TryExecute performs a non-streaming exec. func (route *Route) TryExecute(ctx context.Context, vcursor VCursor, bindVars map[string]*querypb.BindVariable, wantfields bool) (*sqltypes.Result, error) { rss, bvs, err := route.findRoute(ctx, vcursor, bindVars) @@ -380,7 +362,6 @@ func (route *Route) sort(in *sqltypes.Result) (*sqltypes.Result, error) { func (route *Route) description() PrimitiveDescription { other := map[string]any{ "Query": route.Query, - "Table": route.GetTableName(), "FieldQuery": route.FieldQuery, } if route.FetchLastInsertID { diff --git a/go/vt/vtgate/engine/rows.go b/go/vt/vtgate/engine/rows.go index 424d5585a36..82fd995a3da 100644 --- a/go/vt/vtgate/engine/rows.go +++ b/go/vt/vtgate/engine/rows.go @@ -39,21 +39,6 @@ func NewRowsPrimitive(rows [][]sqltypes.Value, fields []*querypb.Field) Primitiv return &Rows{rows: rows, fields: fields} } -// RouteType implements the Primitive interface -func (r *Rows) RouteType() string { - return "Rows" -} - -// GetKeyspaceName implements the Primitive interface -func (r *Rows) GetKeyspaceName() string { - return "" -} - -// GetTableName implements the Primitive interface -func (r *Rows) GetTableName() string { - return "" -} - // TryExecute implements the Primitive interface func (r *Rows) TryExecute(context.Context, VCursor, map[string]*querypb.BindVariable, bool) (*sqltypes.Result, error) { return &sqltypes.Result{ diff --git a/go/vt/vtgate/engine/scalar_aggregation.go b/go/vt/vtgate/engine/scalar_aggregation.go index e33204f5c58..2bd1f2c6003 100644 --- a/go/vt/vtgate/engine/scalar_aggregation.go +++ b/go/vt/vtgate/engine/scalar_aggregation.go @@ -41,22 +41,6 @@ type ScalarAggregate struct { Input Primitive } -// RouteType implements the Primitive interface -func (sa *ScalarAggregate) RouteType() string { - return sa.Input.RouteType() -} - -// GetKeyspaceName implements the Primitive interface -func (sa *ScalarAggregate) GetKeyspaceName() string { - return sa.Input.GetKeyspaceName() - -} - -// GetTableName implements the Primitive interface -func (sa *ScalarAggregate) GetTableName() string { - return sa.Input.GetTableName() -} - // GetFields implements the Primitive interface func (sa *ScalarAggregate) GetFields(ctx context.Context, vcursor VCursor, bindVars map[string]*querypb.BindVariable) (*sqltypes.Result, error) { qr, err := sa.Input.GetFields(ctx, vcursor, bindVars) diff --git a/go/vt/vtgate/engine/semi_join.go b/go/vt/vtgate/engine/semi_join.go index b5bc74a5941..78141cb6b81 100644 --- a/go/vt/vtgate/engine/semi_join.go +++ b/go/vt/vtgate/engine/semi_join.go @@ -103,33 +103,13 @@ func (jn *SemiJoin) Inputs() ([]Primitive, []map[string]any) { }} } -// RouteType returns a description of the query routing type used by the primitive -func (jn *SemiJoin) RouteType() string { - return "SemiJoin" -} - -// GetKeyspaceName specifies the Keyspace that this primitive routes to. -func (jn *SemiJoin) GetKeyspaceName() string { - if jn.Left.GetKeyspaceName() == jn.Right.GetKeyspaceName() { - return jn.Left.GetKeyspaceName() - } - return jn.Left.GetKeyspaceName() + "_" + jn.Right.GetKeyspaceName() -} - -// GetTableName specifies the table that this primitive routes to. -func (jn *SemiJoin) GetTableName() string { - return jn.Left.GetTableName() + "_" + jn.Right.GetTableName() -} - // NeedsTransaction implements the Primitive interface func (jn *SemiJoin) NeedsTransaction() bool { return jn.Right.NeedsTransaction() || jn.Left.NeedsTransaction() } func (jn *SemiJoin) description() PrimitiveDescription { - other := map[string]any{ - "TableName": jn.GetTableName(), - } + other := map[string]any{} if len(jn.Vars) > 0 { other["JoinVars"] = orderedStringIntMap(jn.Vars) } diff --git a/go/vt/vtgate/engine/send.go b/go/vt/vtgate/engine/send.go index 01a87bd76b9..d80a7ebe6cd 100644 --- a/go/vt/vtgate/engine/send.go +++ b/go/vt/vtgate/engine/send.go @@ -72,25 +72,6 @@ func (s *Send) NeedsTransaction() bool { return s.IsDML } -// RouteType implements Primitive interface -func (s *Send) RouteType() string { - if s.IsDML { - return "SendDML" - } - - return "Send" -} - -// GetKeyspaceName implements Primitive interface -func (s *Send) GetKeyspaceName() string { - return s.Keyspace.Name -} - -// GetTableName implements Primitive interface -func (s *Send) GetTableName() string { - return "" -} - // TryExecute implements Primitive interface func (s *Send) TryExecute(ctx context.Context, vcursor VCursor, bindVars map[string]*querypb.BindVariable, wantfields bool) (*sqltypes.Result, error) { if err := s.commitIfDDL(ctx, vcursor); err != nil { @@ -199,7 +180,6 @@ func (s *Send) GetFields(ctx context.Context, vcursor VCursor, bindVars map[stri func (s *Send) description() PrimitiveDescription { other := map[string]any{ "Query": s.Query, - "Table": s.GetTableName(), "IsDML": s.IsDML, "SingleShardOnly": s.SingleShardOnly, "ShardNameNeeded": s.ShardNameNeeded, diff --git a/go/vt/vtgate/engine/sequential.go b/go/vt/vtgate/engine/sequential.go index 56be78c12e1..0720d966827 100644 --- a/go/vt/vtgate/engine/sequential.go +++ b/go/vt/vtgate/engine/sequential.go @@ -41,29 +41,6 @@ func NewSequential(Sources []Primitive) *Sequential { } } -// RouteType returns a description of the query routing type used by the primitive -func (s *Sequential) RouteType() string { - return "Sequential" -} - -// GetKeyspaceName specifies the Keyspace that this primitive routes to -func (s *Sequential) GetKeyspaceName() string { - res := s.Sources[0].GetKeyspaceName() - for i := 1; i < len(s.Sources); i++ { - res = formatTwoOptionsNicely(res, s.Sources[i].GetKeyspaceName()) - } - return res -} - -// GetTableName specifies the table that this primitive routes to. -func (s *Sequential) GetTableName() string { - res := s.Sources[0].GetTableName() - for i := 1; i < len(s.Sources); i++ { - res = formatTwoOptionsNicely(res, s.Sources[i].GetTableName()) - } - return res -} - // TryExecute performs a non-streaming exec. func (s *Sequential) TryExecute(ctx context.Context, vcursor VCursor, bindVars map[string]*querypb.BindVariable, wantFields bool) (*sqltypes.Result, error) { finalRes := &sqltypes.Result{} @@ -98,5 +75,5 @@ func (s *Sequential) Inputs() ([]Primitive, []map[string]any) { } func (s *Sequential) description() PrimitiveDescription { - return PrimitiveDescription{OperatorType: s.RouteType()} + return PrimitiveDescription{OperatorType: "Sequential"} } diff --git a/go/vt/vtgate/engine/session_primitive.go b/go/vt/vtgate/engine/session_primitive.go index c9c39c39e2b..a0a303452b5 100644 --- a/go/vt/vtgate/engine/session_primitive.go +++ b/go/vt/vtgate/engine/session_primitive.go @@ -44,21 +44,6 @@ func NewSessionPrimitive(name string, action func(sa SessionActions) (*sqltypes. } } -// RouteType implements the Primitive interface -func (s *SessionPrimitive) RouteType() string { - return "SHOW" -} - -// GetKeyspaceName implements the Primitive interface -func (s *SessionPrimitive) GetKeyspaceName() string { - return "" -} - -// GetTableName implements the Primitive interface -func (s *SessionPrimitive) GetTableName() string { - return "" -} - // TryExecute implements the Primitive interface func (s *SessionPrimitive) TryExecute(ctx context.Context, vcursor VCursor, bindVars map[string]*querypb.BindVariable, wantfields bool) (*sqltypes.Result, error) { return s.action(vcursor.Session()) diff --git a/go/vt/vtgate/engine/set.go b/go/vt/vtgate/engine/set.go index 32a297404f3..f2087000d49 100644 --- a/go/vt/vtgate/engine/set.go +++ b/go/vt/vtgate/engine/set.go @@ -99,21 +99,6 @@ var unsupportedSQLModes = []string{"ANSI_QUOTES", "NO_BACKSLASH_ESCAPES", "PIPES var _ Primitive = (*Set)(nil) -// RouteType implements the Primitive interface method. -func (s *Set) RouteType() string { - return "Set" -} - -// GetKeyspaceName implements the Primitive interface method. -func (s *Set) GetKeyspaceName() string { - return "" -} - -// GetTableName implements the Primitive interface method. -func (s *Set) GetTableName() string { - return "" -} - // TryExecute implements the Primitive interface method. func (s *Set) TryExecute(ctx context.Context, vcursor VCursor, bindVars map[string]*querypb.BindVariable, wantfields bool) (*sqltypes.Result, error) { input, err := vcursor.ExecutePrimitive(ctx, s.Input, bindVars, false) diff --git a/go/vt/vtgate/engine/show_exec.go b/go/vt/vtgate/engine/show_exec.go index d09733d0ec1..af422cfcf13 100644 --- a/go/vt/vtgate/engine/show_exec.go +++ b/go/vt/vtgate/engine/show_exec.go @@ -35,18 +35,6 @@ type ShowExec struct { ShowFilter *sqlparser.ShowFilter } -func (s *ShowExec) RouteType() string { - return "ShowExec" -} - -func (s *ShowExec) GetKeyspaceName() string { - return "" -} - -func (s *ShowExec) GetTableName() string { - return "" -} - func (s *ShowExec) GetFields(ctx context.Context, vcursor VCursor, bindVars map[string]*query.BindVariable) (*sqltypes.Result, error) { qr, err := s.TryExecute(ctx, vcursor, bindVars, true) if err != nil { diff --git a/go/vt/vtgate/engine/simple_projection.go b/go/vt/vtgate/engine/simple_projection.go index 6edc5883be1..5649b3b22ad 100644 --- a/go/vt/vtgate/engine/simple_projection.go +++ b/go/vt/vtgate/engine/simple_projection.go @@ -46,21 +46,6 @@ func (sc *SimpleProjection) NeedsTransaction() bool { return sc.Input.NeedsTransaction() } -// RouteType returns a description of the query routing type used by the primitive -func (sc *SimpleProjection) RouteType() string { - return sc.Input.RouteType() -} - -// GetKeyspaceName specifies the Keyspace that this primitive routes to. -func (sc *SimpleProjection) GetKeyspaceName() string { - return sc.Input.GetKeyspaceName() -} - -// GetTableName specifies the table that this primitive routes to. -func (sc *SimpleProjection) GetTableName() string { - return sc.Input.GetTableName() -} - // TryExecute performs a non-streaming exec. func (sc *SimpleProjection) TryExecute(ctx context.Context, vcursor VCursor, bindVars map[string]*querypb.BindVariable, wantfields bool) (*sqltypes.Result, error) { inner, err := vcursor.ExecutePrimitive(ctx, sc.Input, bindVars, wantfields) diff --git a/go/vt/vtgate/engine/singlerow.go b/go/vt/vtgate/engine/singlerow.go index 8a3fff2cacd..e8d325a296c 100644 --- a/go/vt/vtgate/engine/singlerow.go +++ b/go/vt/vtgate/engine/singlerow.go @@ -32,21 +32,6 @@ type SingleRow struct { noFields } -// RouteType returns a description of the query routing type used by the primitive -func (s *SingleRow) RouteType() string { - return "" -} - -// GetKeyspaceName specifies the Keyspace that this primitive routes to. -func (s *SingleRow) GetKeyspaceName() string { - return "" -} - -// GetTableName specifies the table that this primitive routes to. -func (s *SingleRow) GetTableName() string { - return "" -} - // TryExecute performs a non-streaming exec. func (s *SingleRow) TryExecute(context.Context, VCursor, map[string]*querypb.BindVariable, bool) (*sqltypes.Result, error) { result := sqltypes.Result{ diff --git a/go/vt/vtgate/engine/sql_calc_found_rows.go b/go/vt/vtgate/engine/sql_calc_found_rows.go index 64ec80f99c7..abf63a41b23 100644 --- a/go/vt/vtgate/engine/sql_calc_found_rows.go +++ b/go/vt/vtgate/engine/sql_calc_found_rows.go @@ -33,21 +33,6 @@ type SQLCalcFoundRows struct { CountPrimitive Primitive } -// RouteType implements the Primitive interface -func (s *SQLCalcFoundRows) RouteType() string { - return "SQLCalcFoundRows" -} - -// GetKeyspaceName implements the Primitive interface -func (s *SQLCalcFoundRows) GetKeyspaceName() string { - return s.LimitPrimitive.GetKeyspaceName() -} - -// GetTableName implements the Primitive interface -func (s *SQLCalcFoundRows) GetTableName() string { - return s.LimitPrimitive.GetTableName() -} - // TryExecute implements the Primitive interface func (s *SQLCalcFoundRows) TryExecute(ctx context.Context, vcursor VCursor, bindVars map[string]*querypb.BindVariable, wantfields bool) (*sqltypes.Result, error) { limitQr, err := vcursor.ExecutePrimitive(ctx, s.LimitPrimitive, bindVars, wantfields) diff --git a/go/vt/vtgate/engine/throttle_app.go b/go/vt/vtgate/engine/throttle_app.go index 8b2370699cf..e50e4c1379e 100644 --- a/go/vt/vtgate/engine/throttle_app.go +++ b/go/vt/vtgate/engine/throttle_app.go @@ -50,21 +50,6 @@ func (v *ThrottleApp) description() PrimitiveDescription { } } -// RouteType implements the Primitive interface -func (v *ThrottleApp) RouteType() string { - return "ThrottleApp" -} - -// GetKeyspaceName implements the Primitive interface -func (v *ThrottleApp) GetKeyspaceName() string { - return v.Keyspace.Name -} - -// GetTableName implements the Primitive interface -func (v *ThrottleApp) GetTableName() string { - return "" -} - // TryExecute implements the Primitive interface func (v *ThrottleApp) TryExecute(ctx context.Context, vcursor VCursor, bindVars map[string]*querypb.BindVariable, wantfields bool) (result *sqltypes.Result, err error) { if err := vcursor.ThrottleApp(ctx, v.ThrottledAppRule); err != nil { diff --git a/go/vt/vtgate/engine/transaction_status.go b/go/vt/vtgate/engine/transaction_status.go index 9914031009f..056a8cda9c3 100644 --- a/go/vt/vtgate/engine/transaction_status.go +++ b/go/vt/vtgate/engine/transaction_status.go @@ -37,18 +37,6 @@ type TransactionStatus struct { TransactionID string } -func (t *TransactionStatus) RouteType() string { - return "TransactionStatus" -} - -func (t *TransactionStatus) GetKeyspaceName() string { - return "" -} - -func (t *TransactionStatus) GetTableName() string { - return "" -} - func (t *TransactionStatus) GetFields(ctx context.Context, vcursor VCursor, bindVars map[string]*querypb.BindVariable) (*sqltypes.Result, error) { return &sqltypes.Result{ Fields: t.getFields(), diff --git a/go/vt/vtgate/engine/uncorrelated_subquery.go b/go/vt/vtgate/engine/uncorrelated_subquery.go index 0bedd02a5d3..aaa36c06f2b 100644 --- a/go/vt/vtgate/engine/uncorrelated_subquery.go +++ b/go/vt/vtgate/engine/uncorrelated_subquery.go @@ -50,21 +50,6 @@ func (ps *UncorrelatedSubquery) Inputs() ([]Primitive, []map[string]any) { }} } -// RouteType returns a description of the query routing type used by the primitive -func (ps *UncorrelatedSubquery) RouteType() string { - return ps.Opcode.String() -} - -// GetKeyspaceName specifies the Keyspace that this primitive routes to. -func (ps *UncorrelatedSubquery) GetKeyspaceName() string { - return ps.Outer.GetKeyspaceName() -} - -// GetTableName specifies the table that this primitive routes to. -func (ps *UncorrelatedSubquery) GetTableName() string { - return ps.Outer.GetTableName() -} - // TryExecute satisfies the Primitive interface. func (ps *UncorrelatedSubquery) TryExecute(ctx context.Context, vcursor VCursor, bindVars map[string]*querypb.BindVariable, wantfields bool) (*sqltypes.Result, error) { combinedVars, err := ps.execSubquery(ctx, vcursor, bindVars) diff --git a/go/vt/vtgate/engine/unlock.go b/go/vt/vtgate/engine/unlock.go index 1047abb6ec5..76768cc8db5 100644 --- a/go/vt/vtgate/engine/unlock.go +++ b/go/vt/vtgate/engine/unlock.go @@ -34,18 +34,6 @@ type Unlock struct { const unlockTables = "unlock tables" -func (u *Unlock) RouteType() string { - return "UNLOCK" -} - -func (u *Unlock) GetKeyspaceName() string { - return "" -} - -func (u *Unlock) GetTableName() string { - return "" -} - func (u *Unlock) GetFields(ctx context.Context, vcursor VCursor, bindVars map[string]*querypb.BindVariable) (*sqltypes.Result, error) { return nil, vterrors.VT13001("GetFields should not be called for unlock tables") } diff --git a/go/vt/vtgate/engine/update.go b/go/vt/vtgate/engine/update.go index 9e878ffce20..e705c251ead 100644 --- a/go/vt/vtgate/engine/update.go +++ b/go/vt/vtgate/engine/update.go @@ -194,7 +194,6 @@ func (upd *Update) isVindexModified() bool { func (upd *Update) description() PrimitiveDescription { other := map[string]any{ "Query": upd.Query, - "Table": upd.GetTableName(), "OwnedVindexQuery": upd.OwnedVindexQuery, "MultiShardAutocommit": upd.MultiShardAutocommit, "QueryTimeout": upd.QueryTimeout, diff --git a/go/vt/vtgate/engine/update_target.go b/go/vt/vtgate/engine/update_target.go index 9f47199079a..2c2925fdc30 100644 --- a/go/vt/vtgate/engine/update_target.go +++ b/go/vt/vtgate/engine/update_target.go @@ -44,21 +44,6 @@ func (updTarget *UpdateTarget) description() PrimitiveDescription { } } -// RouteType implements the Primitive interface -func (updTarget *UpdateTarget) RouteType() string { - return "UpdateTarget" -} - -// GetKeyspaceName implements the Primitive interface -func (updTarget *UpdateTarget) GetKeyspaceName() string { - return updTarget.Target -} - -// GetTableName implements the Primitive interface -func (updTarget *UpdateTarget) GetTableName() string { - return "" -} - // TryExecute implements the Primitive interface func (updTarget *UpdateTarget) TryExecute(ctx context.Context, vcursor VCursor, bindVars map[string]*query.BindVariable, wantfields bool) (*sqltypes.Result, error) { err := vcursor.Session().SetTarget(updTarget.Target) diff --git a/go/vt/vtgate/engine/upsert.go b/go/vt/vtgate/engine/upsert.go index 58d996b2b2b..9a57b2fa70c 100644 --- a/go/vt/vtgate/engine/upsert.go +++ b/go/vt/vtgate/engine/upsert.go @@ -50,27 +50,6 @@ func (u *Upsert) AddUpsert(ins, upd Primitive) { }) } -// RouteType implements Primitive interface type. -func (u *Upsert) RouteType() string { - return "UPSERT" -} - -// GetKeyspaceName implements Primitive interface type. -func (u *Upsert) GetKeyspaceName() string { - if len(u.Upserts) > 0 { - return u.Upserts[0].Insert.GetKeyspaceName() - } - return "" -} - -// GetTableName implements Primitive interface type. -func (u *Upsert) GetTableName() string { - if len(u.Upserts) > 0 { - return u.Upserts[0].Insert.GetTableName() - } - return "" -} - // TryExecute implements Primitive interface type. func (u *Upsert) TryExecute(ctx context.Context, vcursor VCursor, bindVars map[string]*querypb.BindVariable, wantfields bool) (*sqltypes.Result, error) { result := &sqltypes.Result{} diff --git a/go/vt/vtgate/engine/vexplain.go b/go/vt/vtgate/engine/vexplain.go index 0785f4d25ce..19831ab96d9 100644 --- a/go/vt/vtgate/engine/vexplain.go +++ b/go/vt/vtgate/engine/vexplain.go @@ -55,21 +55,6 @@ type ( var _ Primitive = (*VExplain)(nil) -// RouteType implements the Primitive interface -func (v *VExplain) RouteType() string { - return v.Input.RouteType() -} - -// GetKeyspaceName implements the Primitive interface -func (v *VExplain) GetKeyspaceName() string { - return v.Input.GetKeyspaceName() -} - -// GetTableName implements the Primitive interface -func (v *VExplain) GetTableName() string { - return v.Input.GetTableName() -} - // GetFields implements the Primitive interface func (v *VExplain) GetFields(context.Context, VCursor, map[string]*querypb.BindVariable) (*sqltypes.Result, error) { var fields []*querypb.Field diff --git a/go/vt/vtgate/engine/vindex_func.go b/go/vt/vtgate/engine/vindex_func.go index 0c43449d4ca..13844b60db8 100644 --- a/go/vt/vtgate/engine/vindex_func.go +++ b/go/vt/vtgate/engine/vindex_func.go @@ -74,21 +74,6 @@ func (code VindexOpcode) MarshalJSON() ([]byte, error) { return json.Marshal(vindexOpcodeName[code]) } -// RouteType returns a description of the query routing type used by the primitive -func (vf *VindexFunc) RouteType() string { - return vindexOpcodeName[vf.Opcode] -} - -// GetKeyspaceName specifies the Keyspace that this primitive routes to. -func (vf *VindexFunc) GetKeyspaceName() string { - return "" -} - -// GetTableName specifies the table that this primitive routes to. -func (vf *VindexFunc) GetTableName() string { - return "" -} - // TryExecute performs a non-streaming exec. func (vf *VindexFunc) TryExecute(ctx context.Context, vcursor VCursor, bindVars map[string]*querypb.BindVariable, wantfields bool) (*sqltypes.Result, error) { return vf.mapVindex(ctx, vcursor, bindVars) diff --git a/go/vt/vtgate/engine/vindex_lookup.go b/go/vt/vtgate/engine/vindex_lookup.go index f9b491ae878..7798903f2a0 100644 --- a/go/vt/vtgate/engine/vindex_lookup.go +++ b/go/vt/vtgate/engine/vindex_lookup.go @@ -55,21 +55,6 @@ type VindexLookup struct { SendTo *Route } -// RouteType implements the Primitive interface -func (vr *VindexLookup) RouteType() string { - return "VindexLookup" -} - -// GetKeyspaceName implements the Primitive interface -func (vr *VindexLookup) GetKeyspaceName() string { - return vr.SendTo.GetKeyspaceName() -} - -// GetTableName implements the Primitive interface -func (vr *VindexLookup) GetTableName() string { - return vr.SendTo.GetTableName() -} - // GetFields implements the Primitive interface func (vr *VindexLookup) GetFields(ctx context.Context, vcursor VCursor, bindVars map[string]*querypb.BindVariable) (*sqltypes.Result, error) { return vr.SendTo.GetFields(ctx, vcursor, bindVars) diff --git a/go/vt/vtgate/engine/vschema_ddl.go b/go/vt/vtgate/engine/vschema_ddl.go index cb107eecb58..1eaff205ec0 100644 --- a/go/vt/vtgate/engine/vschema_ddl.go +++ b/go/vt/vtgate/engine/vschema_ddl.go @@ -47,21 +47,6 @@ func (v *AlterVSchema) description() PrimitiveDescription { } } -// RouteType implements the Primitive interface -func (v *AlterVSchema) RouteType() string { - return "AlterVSchema" -} - -// GetKeyspaceName implements the Primitive interface -func (v *AlterVSchema) GetKeyspaceName() string { - return v.Keyspace.Name -} - -// GetTableName implements the Primitive interface -func (v *AlterVSchema) GetTableName() string { - return v.AlterVschemaDDL.Table.Name.String() -} - // TryExecute implements the Primitive interface func (v *AlterVSchema) TryExecute(ctx context.Context, vcursor VCursor, bindVars map[string]*query.BindVariable, wantfields bool) (*sqltypes.Result, error) { err := vcursor.ExecuteVSchema(ctx, v.Keyspace.Name, v.AlterVschemaDDL) diff --git a/go/vt/vtgate/engine/vstream.go b/go/vt/vtgate/engine/vstream.go index aafc500aba0..e2d54ecfe84 100644 --- a/go/vt/vtgate/engine/vstream.go +++ b/go/vt/vtgate/engine/vstream.go @@ -45,21 +45,6 @@ type VStream struct { Limit int } -// RouteType implements the Primitive interface -func (v *VStream) RouteType() string { - return "VStream" -} - -// GetKeyspaceName implements the Primitive interface -func (v *VStream) GetKeyspaceName() string { - return v.Keyspace.Name -} - -// GetTableName implements the Primitive interface -func (v *VStream) GetTableName() string { - return v.TableName -} - // TryExecute implements the Primitive interface func (v *VStream) TryExecute(ctx context.Context, vcursor VCursor, bindVars map[string]*querypb.BindVariable, wantfields bool) (*sqltypes.Result, error) { return nil, vterrors.VT13001("TryExecute is not supported for VStream") diff --git a/go/vt/vtgate/executor.go b/go/vt/vtgate/executor.go index 860604d5df2..389b30af6f2 100644 --- a/go/vt/vtgate/executor.go +++ b/go/vt/vtgate/executor.go @@ -72,12 +72,6 @@ import ( var ( defaultTabletType = topodatapb.TabletType_PRIMARY - // TODO: @harshit/@systay - Remove these deprecated stats once we have a replacement in a released version. - queriesProcessed = stats.NewCountersWithSingleLabel("QueriesProcessed", "Deprecated: Queries processed at vtgate by plan type", "Plan") - queriesRouted = stats.NewCountersWithSingleLabel("QueriesRouted", "Deprecated: Queries routed from vtgate to vttablet by plan type", "Plan") - queriesProcessedByTable = stats.NewCountersWithMultiLabels("QueriesProcessedByTable", "Deprecated: Queries processed at vtgate by plan type, keyspace and table", []string{"Plan", "Keyspace", "Table"}) - queriesRoutedByTable = stats.NewCountersWithMultiLabels("QueriesRoutedByTable", "Deprecated: Queries routed from vtgate to vttablet by plan type, keyspace and table", []string{"Plan", "Keyspace", "Table"}) - queryExecutions = stats.NewCountersWithMultiLabels("QueryExecutions", "Counts queries executed at VTGate by query type, plan type, and tablet type.", []string{"Query", "Plan", "Tablet"}) queryRoutes = stats.NewCountersWithMultiLabels("QueryRoutes", "Counts queries routed from VTGate to VTTablet by query type, plan type, and tablet type.", []string{"Query", "Plan", "Tablet"}) queryExecutionsByTable = stats.NewCountersWithMultiLabels("QueryExecutionsByTable", "Counts queries executed at VTGate per table by query type and table.", []string{"Query", "Table"}) @@ -397,7 +391,6 @@ func (e *Executor) StreamExecute( logStats.ExecuteTime = time.Since(execStart) logStats.ActiveKeyspace = vc.GetKeyspace() - e.updateQueryCounts(plan.Instructions.RouteType(), plan.Instructions.GetKeyspaceName(), plan.Instructions.GetTableName(), int64(logStats.ShardQueries)) e.updateQueryStats(plan.QueryType.String(), plan.Type.String(), vc.TabletType().String(), int64(logStats.ShardQueries), plan.TablesUsed) return err @@ -614,7 +607,6 @@ func ifReadAfterWriteExist(session *econtext.SafeSession, f func(*vtgatepb.ReadA func (e *Executor) handleBegin(ctx context.Context, vcursor *econtext.VCursorImpl, safeSession *econtext.SafeSession, logStats *logstats.LogStats, stmt sqlparser.Statement) (*sqltypes.Result, error) { execStart := time.Now() logStats.PlanTime = execStart.Sub(logStats.StartTime) - e.updateQueryCounts(sqlparser.StmtBegin.String(), "", "", 0) e.updateQueryStats(sqlparser.StmtBegin.String(), engine.PlanTransaction.String(), vcursor.TabletType().String(), 0, nil) begin := stmt.(*sqlparser.Begin) @@ -627,7 +619,6 @@ func (e *Executor) handleCommit(ctx context.Context, vcursor *econtext.VCursorIm execStart := time.Now() logStats.PlanTime = execStart.Sub(logStats.StartTime) logStats.ShardQueries = uint64(len(safeSession.ShardSessions)) - e.updateQueryCounts(sqlparser.StmtCommit.String(), "", "", int64(logStats.ShardQueries)) e.updateQueryStats(sqlparser.StmtCommit.String(), engine.PlanTransaction.String(), vcursor.TabletType().String(), int64(logStats.ShardQueries), nil) err := e.txConn.Commit(ctx, safeSession) @@ -644,7 +635,6 @@ func (e *Executor) handleRollback(ctx context.Context, vcursor *econtext.VCursor execStart := time.Now() logStats.PlanTime = execStart.Sub(logStats.StartTime) logStats.ShardQueries = uint64(len(safeSession.ShardSessions)) - e.updateQueryCounts(sqlparser.StmtRollback.String(), "", "", int64(logStats.ShardQueries)) e.updateQueryStats(sqlparser.StmtRollback.String(), engine.PlanTransaction.String(), vcursor.TabletType().String(), int64(logStats.ShardQueries), nil) err := e.txConn.Rollback(ctx, safeSession) @@ -656,7 +646,6 @@ func (e *Executor) handleSavepoint(ctx context.Context, vcursor *econtext.VCurso execStart := time.Now() logStats.PlanTime = execStart.Sub(logStats.StartTime) logStats.ShardQueries = uint64(len(safeSession.ShardSessions)) - e.updateQueryCounts(queryType, "", "", int64(logStats.ShardQueries)) e.updateQueryStats(queryType, engine.PlanTransaction.String(), vcursor.TabletType().String(), int64(logStats.ShardQueries), nil) defer func() { @@ -719,7 +708,6 @@ func (e *Executor) executeSPInAllSessions(ctx context.Context, safeSession *econ func (e *Executor) handleKill(ctx context.Context, mysqlCtx vtgateservice.MySQLConnection, vcursor *econtext.VCursorImpl, stmt sqlparser.Statement, logStats *logstats.LogStats) (result *sqltypes.Result, err error) { execStart := time.Now() logStats.PlanTime = execStart.Sub(logStats.StartTime) - e.updateQueryCounts("Kill", "", "", 0) e.updateQueryStats("Kill", engine.PlanLocal.String(), vcursor.TabletType().String(), 0, nil) defer func() { @@ -1420,15 +1408,6 @@ func (e *Executor) ClearPlans() { e.epoch.Add(1) } -func (e *Executor) updateQueryCounts(planType, keyspace, tableName string, shardQueries int64) { - queriesProcessed.Add(planType, 1) - queriesRouted.Add(planType, shardQueries) - if tableName != "" { - queriesProcessedByTable.Add([]string{planType, keyspace, tableName}, 1) - queriesRoutedByTable.Add([]string{planType, keyspace, tableName}, shardQueries) - } -} - func (e *Executor) updateQueryStats(queryType, planType, tabletType string, shards int64, tables []string) { queryExecutions.Add([]string{queryType, planType, tabletType}, 1) queryRoutes.Add([]string{queryType, planType, tabletType}, shards) diff --git a/go/vt/vtgate/executor_scatter_stats.go b/go/vt/vtgate/executor_scatter_stats.go index beaa60d7012..6a8fb7d9cca 100644 --- a/go/vt/vtgate/executor_scatter_stats.go +++ b/go/vt/vtgate/executor_scatter_stats.go @@ -19,6 +19,7 @@ package vtgate import ( "fmt" "net/http" + "strings" "sync/atomic" "time" @@ -26,8 +27,6 @@ import ( "vitess.io/vitess/go/vt/logz" - "vitess.io/vitess/go/vt/proto/vtrpc" - "vitess.io/vitess/go/vt/vterrors" "vitess.io/vitess/go/vt/vtgate/engine" ) @@ -58,9 +57,7 @@ func (e *Executor) gatherScatterStats() (statsResults, error) { totalExecTime := time.Duration(0) totalCount := uint64(0) - var err error plans := make([]*engine.Plan, 0) - routes := make([]*engine.Route, 0) // First we go over all plans and collect statistics and all query plans for scatter queries e.ForEachPlan(func(plan *engine.Plan) bool { scatter := engine.Find(findScatter, plan.Instructions) @@ -68,13 +65,7 @@ func (e *Executor) gatherScatterStats() (statsResults, error) { isScatter := scatter != nil if isScatter { - route, isRoute := scatter.(*engine.Route) - if !isRoute { - err = vterrors.Errorf(vtrpc.Code_INTERNAL, "expected a route, but found a %v", scatter) - return false - } plans = append(plans, plan) - routes = append(routes, route) scatterExecTime += time.Duration(atomic.LoadUint64(&plan.ExecTime)) scatterCount += atomic.LoadUint64(&plan.ExecCount) } @@ -87,14 +78,10 @@ func (e *Executor) gatherScatterStats() (statsResults, error) { totalCount += atomic.LoadUint64(&plan.ExecCount) return true }) - if err != nil { - return statsResults{}, err - } // Now we'll go over all scatter queries we've found and produce result items for each resultItems := make([]*statsResultItem, len(plans)) for i, plan := range plans { - route := routes[i] execCount := atomic.LoadUint64(&plan.ExecCount) execTime := time.Duration(atomic.LoadUint64(&plan.ExecTime)) @@ -102,6 +89,7 @@ func (e *Executor) gatherScatterStats() (statsResults, error) { if execCount != 0 { avgTimePerQuery = execTime.Nanoseconds() / int64(execCount) } + resultItems[i] = &statsResultItem{ Query: plan.Original, AvgTimePerQuery: time.Duration(avgTimePerQuery), @@ -109,7 +97,7 @@ func (e *Executor) gatherScatterStats() (statsResults, error) { PercentTimeOfScatters: 100 * float64(execTime) / float64(scatterExecTime), PercentCountOfReads: 100 * float64(execCount) / float64(readOnlyCount), PercentCountOfScatters: 100 * float64(execCount) / float64(scatterCount), - From: route.Keyspace.Name + "." + route.GetTableName(), + From: strings.Join(plan.TablesUsed, ","), Count: execCount, } } diff --git a/go/vt/vtgate/executor_test.go b/go/vt/vtgate/executor_test.go index 0ed67cb8a27..863cec357af 100644 --- a/go/vt/vtgate/executor_test.go +++ b/go/vt/vtgate/executor_test.go @@ -2340,7 +2340,7 @@ func TestExecutorVExplain(t *testing.T) { require.NoError(t, err) require.Equal(t, - `[[VARCHAR("{\n\t\"OperatorType\": \"Route\",\n\t\"Variant\": \"Scatter\",\n\t\"Keyspace\": {\n\t\t\"Name\": \"TestExecutor\",\n\t\t\"Sharded\": true\n\t},\n\t\"FieldQuery\": \"select * from `+"`user`"+` where 1 != 1\",\n\t\"Query\": \"select * from `+"`user`"+`\",\n\t\"Table\": \"`+"`user`"+`\"\n}")]]`, + `[[VARCHAR("{\n\t\"OperatorType\": \"Route\",\n\t\"Variant\": \"Scatter\",\n\t\"Keyspace\": {\n\t\t\"Name\": \"TestExecutor\",\n\t\t\"Sharded\": true\n\t},\n\t\"FieldQuery\": \"select * from `+"`user`"+` where 1 != 1\",\n\t\"Query\": \"select * from `+"`user`"+`\"\n}")]]`, fmt.Sprintf("%v", result.Rows)) result, err = executorExec(ctx, executor, session, "vexplain plan select 42", bindVars) diff --git a/go/vt/vtgate/executor_vexplain_test.go b/go/vt/vtgate/executor_vexplain_test.go index 0e929a76291..0f26b7da035 100644 --- a/go/vt/vtgate/executor_vexplain_test.go +++ b/go/vt/vtgate/executor_vexplain_test.go @@ -109,8 +109,7 @@ func TestSimpleVexplainTrace(t *testing.T) { "ShardsQueried": 8, "FieldQuery": "select count(*), col2, weight_string(col2) from music where 1 != 1 group by col2, weight_string(col2)", "OrderBy": "(1|2) ASC", - "Query": "select count(*), col2, weight_string(col2) from music group by col2, weight_string(col2) order by col2 asc", - "Table": "music" + "Query": "select count(*), col2, weight_string(col2) from music group by col2, weight_string(col2) order by col2 asc" } ] }` diff --git a/go/vt/vtgate/plan_execute.go b/go/vt/vtgate/plan_execute.go index 6e0672d845b..df950e679b0 100644 --- a/go/vt/vtgate/plan_execute.go +++ b/go/vt/vtgate/plan_execute.go @@ -415,7 +415,6 @@ func (e *Executor) setLogStats(logStats *logstats.LogStats, plan *engine.Plan, v func (e *Executor) logExecutionEnd(logStats *logstats.LogStats, execStart time.Time, plan *engine.Plan, vcursor *econtext.VCursorImpl, err error, qr *sqltypes.Result) uint64 { logStats.ExecuteTime = time.Since(execStart) - e.updateQueryCounts(plan.Instructions.RouteType(), plan.Instructions.GetKeyspaceName(), plan.Instructions.GetTableName(), int64(logStats.ShardQueries)) e.updateQueryStats(plan.QueryType.String(), plan.Type.String(), vcursor.TabletType().String(), int64(logStats.ShardQueries), plan.TablesUsed) var errCount uint64 diff --git a/go/vt/vtgate/planbuilder/ddl.go b/go/vt/vtgate/planbuilder/ddl.go index 4804011f240..dd135154f9f 100644 --- a/go/vt/vtgate/planbuilder/ddl.go +++ b/go/vt/vtgate/planbuilder/ddl.go @@ -224,11 +224,11 @@ func buildCreateViewCommon( vschema plancontext.VSchema, reservedVars *sqlparser.ReservedVars, cfg dynamicconfig.DDL, - ddlSelect sqlparser.TableStatement, + sel sqlparser.TableStatement, ddl sqlparser.DDLStatement, ) (key.ShardDestination, *vindexes.Keyspace, error) { if vschema.IsViewsEnabled() { - return createViewEnabled(vschema, reservedVars, ddlSelect, ddl) + return createViewEnabled(vschema, reservedVars, sel, ddl) } // For Create View, we require that the keyspace exist and the select query can be satisfied within the keyspace itself @@ -238,22 +238,33 @@ func buildCreateViewCommon( return nil, nil, err } - // because we don't trust the schema tracker to have up-to-date info, we don't want to expand any SELECT * here + // views definition with `select *` should not be expanded as schema tracker might not be up-to-date + // We copy the expressions and restore them after the planning context is created var expressions []*sqlparser.SelectExprs - _ = sqlparser.VisitAllSelects(ddlSelect, func(p *sqlparser.Select, idx int) error { + _ = sqlparser.VisitAllSelects(sel, func(p *sqlparser.Select, idx int) error { expressions = append(expressions, sqlparser.Clone(p.SelectExprs)) return nil }) - selectPlan, err := createInstructionFor(ctx, sqlparser.String(ddlSelect), ddlSelect, reservedVars, vschema, cfg) + selectPlan, err := createInstructionFor(ctx, sqlparser.String(sel), sel, reservedVars, vschema, cfg) if err != nil { return nil, nil, err } - selPlanKs := selectPlan.primitive.GetKeyspaceName() - if keyspace.Name != selPlanKs { + + diffKs := false + engine.Visit(selectPlan.primitive, func(node engine.Primitive) { + if route, ok := node.(*engine.Route); ok { + if route.Keyspace.Name != keyspace.Name { + diffKs = true + } + } + }) + + if diffKs { return nil, nil, vterrors.VT12001(ViewDifferentKeyspace) } - _ = sqlparser.VisitAllSelects(ddlSelect, func(p *sqlparser.Select, idx int) error { + // We need to restore the original select expressions + _ = sqlparser.VisitAllSelects(sel, func(p *sqlparser.Select, idx int) error { p.SelectExprs = expressions[idx] return nil }) @@ -309,6 +320,7 @@ func createViewEnabled(vschema plancontext.VSchema, reservedVars *sqlparser.Rese return nil, nil, vterrors.VT12001(ViewDifferentKeyspace) } + // We need to restore the original select expressions _ = sqlparser.VisitAllSelects(ddlSelect, func(p *sqlparser.Select, idx int) error { p.SelectExprs = expressions[idx] return nil diff --git a/go/vt/vtgate/planbuilder/operator_transformers.go b/go/vt/vtgate/planbuilder/operator_transformers.go index fcd4f64fc2f..d13b31a9185 100644 --- a/go/vt/vtgate/planbuilder/operator_transformers.go +++ b/go/vt/vtgate/planbuilder/operator_transformers.go @@ -537,16 +537,10 @@ func transformApplyJoinPlan(ctx *plancontext.PlanningContext, n *operators.Apply } func routeToEngineRoute(ctx *plancontext.PlanningContext, op *operators.Route, hints *queryHints) (*engine.Route, error) { - tableNames, err := getAllTableNames(op) - if err != nil { - return nil, err - } - rp := newRoutingParams(ctx, op.Routing.OpCode()) op.Routing.UpdateRoutingParams(ctx, rp) e := &engine.Route{ - TableName: strings.Join(tableNames, ", "), RoutingParameters: rp, TruncateColumnCount: op.ResultColumns, FetchLastInsertID: ctx.SemTable.ShouldFetchLastInsertID(), diff --git a/go/vt/vtgate/planbuilder/single_sharded_shortcut.go b/go/vt/vtgate/planbuilder/single_sharded_shortcut.go index 5d877cd341d..9188ff13552 100644 --- a/go/vt/vtgate/planbuilder/single_sharded_shortcut.go +++ b/go/vt/vtgate/planbuilder/single_sharded_shortcut.go @@ -18,7 +18,6 @@ package planbuilder import ( "sort" - "strings" "vitess.io/vitess/go/vt/sqlparser" "vitess.io/vitess/go/vt/vtgate/engine" @@ -51,7 +50,6 @@ func selectUnshardedShortcut(ctx *plancontext.PlanningContext, stmt sqlparser.Se Opcode: engine.Unsharded, Keyspace: ks, }, - TableName: strings.Join(escapedTableNames(tableNames), ", "), } prim, err := WireupRoute(ctx, eroute, stmt) if err != nil { @@ -60,14 +58,6 @@ func selectUnshardedShortcut(ctx *plancontext.PlanningContext, stmt sqlparser.Se return prim, operators.QualifiedTableNames(ks, tableNames), nil } -func escapedTableNames(tableNames []sqlparser.TableName) []string { - escaped := make([]string, len(tableNames)) - for i, tableName := range tableNames { - escaped[i] = sqlparser.String(tableName) - } - return escaped -} - func getTableNames(semTable *semantics.SemTable) ([]sqlparser.TableName, error) { tableNameMap := make(map[string]sqlparser.TableName) diff --git a/go/vt/vtgate/planbuilder/testdata/aggr_cases.json b/go/vt/vtgate/planbuilder/testdata/aggr_cases.json index a1b53981128..8986358baaa 100644 --- a/go/vt/vtgate/planbuilder/testdata/aggr_cases.json +++ b/go/vt/vtgate/planbuilder/testdata/aggr_cases.json @@ -24,7 +24,6 @@ "JoinVars": { "user_foo": 1 }, - "TableName": "`user`_user_extra", "Inputs": [ { "OperatorType": "Route", @@ -34,8 +33,7 @@ "Sharded": true }, "FieldQuery": "select count(*), `user`.foo from `user` where 1 != 1 group by `user`.foo", - "Query": "select count(*), `user`.foo from `user` group by `user`.foo", - "Table": "`user`" + "Query": "select count(*), `user`.foo from `user` group by `user`.foo" }, { "OperatorType": "Route", @@ -45,8 +43,7 @@ "Sharded": true }, "FieldQuery": "select count(*) from user_extra where 1 != 1 group by .0", - "Query": "select count(*) from user_extra where user_extra.bar = :user_foo group by .0", - "Table": "user_extra" + "Query": "select count(*) from user_extra where user_extra.bar = :user_foo group by .0" } ] } @@ -85,7 +82,6 @@ "JoinVars": { "user_foo": 1 }, - "TableName": "`user`_user_extra", "Inputs": [ { "OperatorType": "Route", @@ -95,8 +91,7 @@ "Sharded": true }, "FieldQuery": "select sum(`user`.col), `user`.foo from `user` where 1 != 1 group by `user`.foo", - "Query": "select sum(`user`.col), `user`.foo from `user` group by `user`.foo", - "Table": "`user`" + "Query": "select sum(`user`.col), `user`.foo from `user` group by `user`.foo" }, { "OperatorType": "Route", @@ -106,8 +101,7 @@ "Sharded": true }, "FieldQuery": "select count(*) from user_extra where 1 != 1 group by .0", - "Query": "select count(*) from user_extra where user_extra.bar = :user_foo group by .0", - "Table": "user_extra" + "Query": "select count(*) from user_extra where user_extra.bar = :user_foo group by .0" } ] } @@ -146,7 +140,6 @@ "JoinVars": { "user_foo": 1 }, - "TableName": "`user`_user_extra", "Inputs": [ { "OperatorType": "Route", @@ -156,8 +149,7 @@ "Sharded": true }, "FieldQuery": "select count(`user`.col), `user`.foo from `user` where 1 != 1 group by `user`.foo", - "Query": "select count(`user`.col), `user`.foo from `user` group by `user`.foo", - "Table": "`user`" + "Query": "select count(`user`.col), `user`.foo from `user` group by `user`.foo" }, { "OperatorType": "Route", @@ -167,8 +159,7 @@ "Sharded": true }, "FieldQuery": "select count(*) from user_extra where 1 != 1 group by .0", - "Query": "select count(*) from user_extra where user_extra.bar = :user_foo group by .0", - "Table": "user_extra" + "Query": "select count(*) from user_extra where user_extra.bar = :user_foo group by .0" } ] } @@ -201,7 +192,6 @@ "JoinVars": { "user_foo": 1 }, - "TableName": "`user`_user_extra", "Inputs": [ { "OperatorType": "Route", @@ -211,8 +201,7 @@ "Sharded": true }, "FieldQuery": "select max(`user`.col), `user`.foo from `user` where 1 != 1 group by `user`.foo", - "Query": "select max(`user`.col), `user`.foo from `user` group by `user`.foo", - "Table": "`user`" + "Query": "select max(`user`.col), `user`.foo from `user` group by `user`.foo" }, { "OperatorType": "Route", @@ -222,8 +211,7 @@ "Sharded": true }, "FieldQuery": "select 1 from user_extra where 1 != 1 group by .0", - "Query": "select 1 from user_extra where user_extra.bar = :user_foo group by .0", - "Table": "user_extra" + "Query": "select 1 from user_extra where user_extra.bar = :user_foo group by .0" } ] } @@ -254,7 +242,6 @@ "JoinVars": { "user_foo": 0 }, - "TableName": "`user`_user_extra", "Inputs": [ { "OperatorType": "Route", @@ -264,8 +251,7 @@ "Sharded": true }, "FieldQuery": "select `user`.foo from `user` where 1 != 1 group by `user`.foo", - "Query": "select `user`.foo from `user` group by `user`.foo", - "Table": "`user`" + "Query": "select `user`.foo from `user` group by `user`.foo" }, { "OperatorType": "Route", @@ -275,8 +261,7 @@ "Sharded": true }, "FieldQuery": "select min(user_extra.col) from user_extra where 1 != 1 group by .0", - "Query": "select min(user_extra.col) from user_extra where user_extra.bar = :user_foo group by .0", - "Table": "user_extra" + "Query": "select min(user_extra.col) from user_extra where user_extra.bar = :user_foo group by .0" } ] } @@ -303,8 +288,7 @@ "Sharded": true }, "FieldQuery": "select id, count(*) as c from `user` where 1 != 1 group by id", - "Query": "select id, count(*) as c from `user` group by id having max(col) > 10", - "Table": "`user`" + "Query": "select id, count(*) as c from `user` group by id having max(col) > 10" }, "TablesUsed": [ "user.user" @@ -331,8 +315,7 @@ "Sharded": true }, "FieldQuery": "select count(*) as a from `user` where 1 != 1", - "Query": "select count(*) as a from `user`", - "Table": "`user`" + "Query": "select count(*) as a from `user`" } ] }, @@ -361,8 +344,7 @@ "Sharded": true }, "FieldQuery": "select id, count(*) from `user` where 1 != 1", - "Query": "select id, count(*) from `user`", - "Table": "`user`" + "Query": "select id, count(*) from `user`" } ] }, @@ -392,8 +374,7 @@ "Sharded": true }, "FieldQuery": "select col from `user` where 1 != 1", - "Query": "select distinct col from `user`", - "Table": "`user`" + "Query": "select distinct col from `user`" } ] }, @@ -423,8 +404,7 @@ }, "FieldQuery": "select col from `user` where 1 != 1 group by col", "OrderBy": "0 ASC", - "Query": "select col from `user` group by col order by col asc", - "Table": "`user`" + "Query": "select col from `user` group by col order by col asc" } ] }, @@ -448,8 +428,7 @@ "Sharded": true }, "FieldQuery": "select id, count(distinct col) from `user` where 1 != 1 group by id", - "Query": "select id, count(distinct col) from `user` group by id", - "Table": "`user`" + "Query": "select id, count(distinct col) from `user` group by id" }, "TablesUsed": [ "user.user" @@ -478,8 +457,7 @@ }, "FieldQuery": "select col, count(distinct id), sum(distinct id) from `user` where 1 != 1 group by col", "OrderBy": "0 ASC", - "Query": "select col, count(distinct id), sum(distinct id) from `user` group by col order by col asc", - "Table": "`user`" + "Query": "select col, count(distinct id), sum(distinct id) from `user` group by col order by col asc" } ] }, @@ -511,8 +489,7 @@ }, "FieldQuery": "select col1, col2, weight_string(col1), weight_string(col2) from `user` where 1 != 1 group by col1, col2, weight_string(col1), weight_string(col2)", "OrderBy": "(0|2) ASC, (1|3) ASC", - "Query": "select col1, col2, weight_string(col1), weight_string(col2) from `user` group by col1, col2, weight_string(col1), weight_string(col2) order by col1 asc, col2 asc", - "Table": "`user`" + "Query": "select col1, col2, weight_string(col1), weight_string(col2) from `user` group by col1, col2, weight_string(col1), weight_string(col2) order by col1 asc, col2 asc" } ] }, @@ -543,8 +520,7 @@ }, "FieldQuery": "select col2, weight_string(col2) from `user` where 1 != 1 group by col2, weight_string(col2)", "OrderBy": "(0|1) ASC", - "Query": "select col2, weight_string(col2) from `user` group by col2, weight_string(col2) order by col2 asc", - "Table": "`user`" + "Query": "select col2, weight_string(col2) from `user` group by col2, weight_string(col2) order by col2 asc" } ] }, @@ -568,8 +544,7 @@ "Sharded": false }, "FieldQuery": "select a, b, count(*) from unsharded where 1 != 1 group by a, b with rollup", - "Query": "select a, b, count(*) from unsharded group by a, b with rollup", - "Table": "unsharded" + "Query": "select a, b, count(*) from unsharded group by a, b with rollup" }, "TablesUsed": [ "main.unsharded" @@ -591,8 +566,7 @@ "Sharded": true }, "FieldQuery": "select id, user_id, count(*) from music where 1 != 1 group by id, user_id with rollup", - "Query": "select id, user_id, count(*) from music group by id, user_id with rollup", - "Table": "music" + "Query": "select id, user_id, count(*) from music group by id, user_id with rollup" }, "TablesUsed": [ "user.music" @@ -622,8 +596,7 @@ }, "FieldQuery": "select col1, col2, weight_string(col1), weight_string(col2) from `user` where 1 != 1 group by col1, col2, weight_string(col1), weight_string(col2)", "OrderBy": "(0|2) ASC, (1|3) ASC", - "Query": "select col1, col2, weight_string(col1), weight_string(col2) from `user` group by col1, col2, weight_string(col1), weight_string(col2) order by col1 asc, col2 asc", - "Table": "`user`" + "Query": "select col1, col2, weight_string(col1), weight_string(col2) from `user` group by col1, col2, weight_string(col1), weight_string(col2) order by col1 asc, col2 asc" } ] }, @@ -652,8 +625,7 @@ "Sharded": true }, "FieldQuery": "select id from (select id, count(`user`.id) = 2 from `user` where 1 != 1 group by id) as subquery_for_limit where 1 != 1", - "Query": "select id from (select id, count(`user`.id) = 2 from `user` group by id having count(`user`.id) = 2) as subquery_for_limit limit 2", - "Table": "`user`" + "Query": "select id from (select id, count(`user`.id) = 2 from `user` group by id having count(`user`.id) = 2) as subquery_for_limit limit 2" } ] }, @@ -685,8 +657,7 @@ }, "FieldQuery": "select col1, col2, weight_string(col1), weight_string(col2) from `user` where 1 != 1 group by col1, col2, weight_string(col1), weight_string(col2)", "OrderBy": "(0|2) ASC, (1|3) ASC", - "Query": "select col1, col2, weight_string(col1), weight_string(col2) from `user` group by col1, col2, weight_string(col1), weight_string(col2) order by col1 asc, col2 asc", - "Table": "`user`" + "Query": "select col1, col2, weight_string(col1), weight_string(col2) from `user` group by col1, col2, weight_string(col1), weight_string(col2) order by col1 asc, col2 asc" } ] }, @@ -718,8 +689,7 @@ }, "FieldQuery": "select col1, min(col2) as `min(distinct col2)`, weight_string(col1), weight_string(min(col2)) from `user` where 1 != 1 group by col1, weight_string(col1)", "OrderBy": "(0|2) ASC", - "Query": "select col1, min(col2) as `min(distinct col2)`, weight_string(col1), weight_string(min(col2)) from `user` group by col1, weight_string(col1) order by col1 asc", - "Table": "`user`" + "Query": "select col1, min(col2) as `min(distinct col2)`, weight_string(col1), weight_string(min(col2)) from `user` group by col1, weight_string(col1) order by col1 asc" } ] }, @@ -756,8 +726,7 @@ }, "FieldQuery": "select col1, col2, weight_string(col1), weight_string(col2) from `user` where 1 != 1 group by col1, col2, weight_string(col1), weight_string(col2)", "OrderBy": "(0|2) ASC, (1|3) ASC", - "Query": "select col1, col2, weight_string(col1), weight_string(col2) from `user` group by col1, col2, weight_string(col1), weight_string(col2) order by col1 asc, col2 asc", - "Table": "`user`" + "Query": "select col1, col2, weight_string(col1), weight_string(col2) from `user` group by col1, col2, weight_string(col1), weight_string(col2) order by col1 asc, col2 asc" } ] } @@ -801,8 +770,7 @@ }, "FieldQuery": "select a, b, count(*), weight_string(a), weight_string(b) from `user` where 1 != 1 group by a, b, weight_string(a), weight_string(b)", "OrderBy": "(0|3) ASC, (1|4) ASC", - "Query": "select a, b, count(*), weight_string(a), weight_string(b) from `user` group by a, b, weight_string(a), weight_string(b) order by a asc, b asc", - "Table": "`user`" + "Query": "select a, b, count(*), weight_string(a), weight_string(b) from `user` group by a, b, weight_string(a), weight_string(b) order by a asc, b asc" } ] }, @@ -825,7 +793,6 @@ "JoinVars": { "t_id": 1 }, - "TableName": "`user`_unsharded", "Inputs": [ { "OperatorType": "Limit", @@ -840,8 +807,7 @@ }, "FieldQuery": "select t.num_segments, t.id from (select id, count(*) as num_segments from `user` where 1 != 1 group by id) as t where 1 != 1", "OrderBy": "0 DESC", - "Query": "select t.num_segments, t.id from (select id, count(*) as num_segments from `user` group by id) as t order by t.num_segments desc limit 20", - "Table": "`user`" + "Query": "select t.num_segments, t.id from (select id, count(*) as num_segments from `user` group by id) as t order by t.num_segments desc limit 20" } ] }, @@ -853,8 +819,7 @@ "Sharded": false }, "FieldQuery": "select u.id, u.`name` from unsharded as u where 1 != 1", - "Query": "select u.id, u.`name` from unsharded as u where u.id = :t_id", - "Table": "unsharded" + "Query": "select u.id, u.`name` from unsharded as u where u.id = :t_id" } ] }, @@ -887,8 +852,7 @@ }, "FieldQuery": "select a, b, count(*), weight_string(b), weight_string(a) from `user` where 1 != 1 group by b, a, weight_string(b), weight_string(a)", "OrderBy": "(1|3) ASC, (0|4) ASC", - "Query": "select a, b, count(*), weight_string(b), weight_string(a) from `user` group by b, a, weight_string(b), weight_string(a) order by b asc, a asc", - "Table": "`user`" + "Query": "select a, b, count(*), weight_string(b), weight_string(a) from `user` group by b, a, weight_string(b), weight_string(a) order by b asc, a asc" } ] }, @@ -920,8 +884,7 @@ }, "FieldQuery": "select a, b, count(*), weight_string(b), weight_string(a) from `user` where 1 != 1 group by b, a, weight_string(b), weight_string(a)", "OrderBy": "(1|3) ASC, (0|4) ASC", - "Query": "select a, b, count(*), weight_string(b), weight_string(a) from `user` group by b, a, weight_string(b), weight_string(a) order by b asc, a asc", - "Table": "`user`" + "Query": "select a, b, count(*), weight_string(b), weight_string(a) from `user` group by b, a, weight_string(b), weight_string(a) order by b asc, a asc" } ] }, @@ -951,7 +914,6 @@ "JoinVars": { "user_id": 0 }, - "TableName": "`user`, user_extra_music", "Inputs": [ { "OperatorType": "Route", @@ -962,8 +924,7 @@ }, "FieldQuery": "select `user`.id, weight_string(`user`.id) from `user`, user_extra where 1 != 1", "OrderBy": "(0|1) ASC", - "Query": "select `user`.id, weight_string(`user`.id) from `user`, user_extra where `user`.id = user_extra.user_id order by `user`.id asc", - "Table": "`user`, user_extra" + "Query": "select `user`.id, weight_string(`user`.id) from `user`, user_extra where `user`.id = user_extra.user_id order by `user`.id asc" }, { "OperatorType": "VindexLookup", @@ -986,7 +947,6 @@ }, "FieldQuery": "select `name`, keyspace_id from name_user_vdx where 1 != 1", "Query": "select `name`, keyspace_id from name_user_vdx where `name` in ::__vals", - "Table": "name_user_vdx", "Values": [ "::name" ], @@ -1000,8 +960,7 @@ "Sharded": true }, "FieldQuery": "select music.`name` from music where 1 != 1", - "Query": "select music.`name` from music where music.id = :user_id", - "Table": "music" + "Query": "select music.`name` from music where music.id = :user_id" } ] } @@ -1037,8 +996,7 @@ }, "FieldQuery": "select col from `user` where 1 != 1 group by col", "OrderBy": "0 ASC", - "Query": "select col from `user` group by col order by col asc", - "Table": "`user`" + "Query": "select col from `user` group by col order by col asc" } ] }, @@ -1072,8 +1030,7 @@ "Sharded": true }, "FieldQuery": "select count(*) from `user` where 1 != 1", - "Query": "select count(*) from `user`", - "Table": "`user`" + "Query": "select count(*) from `user`" } ] }, @@ -1105,8 +1062,7 @@ }, "FieldQuery": "select a, b, c, d, count(*), weight_string(a), weight_string(b), weight_string(c) from `user` where 1 != 1 group by a, b, c, weight_string(a), weight_string(b), weight_string(c)", "OrderBy": "(0|5) ASC, (1|6) ASC, (2|7) ASC", - "Query": "select a, b, c, d, count(*), weight_string(a), weight_string(b), weight_string(c) from `user` group by a, b, c, weight_string(a), weight_string(b), weight_string(c) order by a asc, b asc, c asc", - "Table": "`user`" + "Query": "select a, b, c, d, count(*), weight_string(a), weight_string(b), weight_string(c) from `user` group by a, b, c, weight_string(a), weight_string(b), weight_string(c) order by a asc, b asc, c asc" } ] }, @@ -1138,8 +1094,7 @@ }, "FieldQuery": "select a, b, c, d, count(*), weight_string(a), weight_string(b), weight_string(c) from `user` where 1 != 1 group by a, b, c, weight_string(a), weight_string(b), weight_string(c)", "OrderBy": "(0|5) ASC, (1|6) ASC, (2|7) ASC", - "Query": "select a, b, c, d, count(*), weight_string(a), weight_string(b), weight_string(c) from `user` group by a, b, c, weight_string(a), weight_string(b), weight_string(c) order by `user`.a asc, `user`.b asc, `user`.c asc", - "Table": "`user`" + "Query": "select a, b, c, d, count(*), weight_string(a), weight_string(b), weight_string(c) from `user` group by a, b, c, weight_string(a), weight_string(b), weight_string(c) order by `user`.a asc, `user`.b asc, `user`.c asc" } ] }, @@ -1171,8 +1126,7 @@ }, "FieldQuery": "select a, b, c, d, count(*), weight_string(d), weight_string(b), weight_string(a), weight_string(c) from `user` where 1 != 1 group by a, b, c, d, weight_string(d), weight_string(b), weight_string(a), weight_string(c)", "OrderBy": "(3|5) ASC, (1|6) ASC, (0|7) ASC, (2|8) ASC", - "Query": "select a, b, c, d, count(*), weight_string(d), weight_string(b), weight_string(a), weight_string(c) from `user` group by a, b, c, d, weight_string(d), weight_string(b), weight_string(a), weight_string(c) order by `user`.d asc, `user`.b asc, `user`.a asc, `user`.c asc", - "Table": "`user`" + "Query": "select a, b, c, d, count(*), weight_string(d), weight_string(b), weight_string(a), weight_string(c) from `user` group by a, b, c, d, weight_string(d), weight_string(b), weight_string(a), weight_string(c) order by `user`.d asc, `user`.b asc, `user`.a asc, `user`.c asc" } ] }, @@ -1204,8 +1158,7 @@ }, "FieldQuery": "select a, b, c, d, count(*), weight_string(d), weight_string(b), weight_string(a), weight_string(c) from `user` where 1 != 1 group by c, b, a, d, weight_string(d), weight_string(b), weight_string(a), weight_string(c)", "OrderBy": "(3|5) ASC, (1|6) ASC, (0|7) ASC, (2|8) ASC", - "Query": "select a, b, c, d, count(*), weight_string(d), weight_string(b), weight_string(a), weight_string(c) from `user` group by c, b, a, d, weight_string(d), weight_string(b), weight_string(a), weight_string(c) order by `user`.d asc, `user`.b asc, `user`.a asc, `user`.c asc", - "Table": "`user`" + "Query": "select a, b, c, d, count(*), weight_string(d), weight_string(b), weight_string(a), weight_string(c) from `user` group by c, b, a, d, weight_string(d), weight_string(b), weight_string(a), weight_string(c) order by `user`.d asc, `user`.b asc, `user`.a asc, `user`.c asc" } ] }, @@ -1237,8 +1190,7 @@ }, "FieldQuery": "select a, b, c, count(*), weight_string(a), weight_string(c), weight_string(b) from `user` where 1 != 1 group by c, b, a, weight_string(a), weight_string(c), weight_string(b)", "OrderBy": "(0|4) DESC, (2|5) DESC, (1|6) ASC", - "Query": "select a, b, c, count(*), weight_string(a), weight_string(c), weight_string(b) from `user` group by c, b, a, weight_string(a), weight_string(c), weight_string(b) order by a desc, c desc, `user`.b asc", - "Table": "`user`" + "Query": "select a, b, c, count(*), weight_string(a), weight_string(c), weight_string(b) from `user` group by c, b, a, weight_string(a), weight_string(c), weight_string(b) order by a desc, c desc, `user`.b asc" } ] }, @@ -1278,8 +1230,7 @@ }, "FieldQuery": "select col, count(*) from `user` where 1 != 1 group by col", "OrderBy": "0 ASC", - "Query": "select col, count(*) from `user` group by col order by col asc", - "Table": "`user`" + "Query": "select col, count(*) from `user` group by col order by col asc" } ] } @@ -1305,8 +1256,7 @@ "Sharded": false }, "FieldQuery": "select id, count(*) from unsharded as route2 where 1 != 1 group by id", - "Query": "select id, count(*) from unsharded as route2 group by id", - "Table": "unsharded" + "Query": "select id, count(*) from unsharded as route2 group by id" }, "TablesUsed": [ "main.unsharded" @@ -1328,8 +1278,7 @@ "Sharded": true }, "FieldQuery": "select col from ref where 1 != 1", - "Query": "select col from ref order by ref.col asc", - "Table": "ref" + "Query": "select col from ref order by ref.col asc" }, "TablesUsed": [ "user.ref" @@ -1356,8 +1305,7 @@ "Sharded": true }, "FieldQuery": "select a, count(*) from `user` where 1 != 1", - "Query": "select a, count(*) from `user`", - "Table": "`user`" + "Query": "select a, count(*) from `user`" } ] }, @@ -1389,8 +1337,7 @@ }, "FieldQuery": "select a, count(*), weight_string(a) from `user` where 1 != 1 group by a, weight_string(a)", "OrderBy": "(0|2) ASC", - "Query": "select a, count(*), weight_string(a) from `user` group by a, weight_string(a) order by a asc", - "Table": "`user`" + "Query": "select a, count(*), weight_string(a) from `user` group by a, weight_string(a) order by a asc" } ] }, @@ -1422,8 +1369,7 @@ }, "FieldQuery": "select id, 1.1 from `user` where 1 != 1 group by 1.1", "OrderBy": "1 ASC", - "Query": "select id, 1.1 from `user` group by 1.1 order by 1.1 asc", - "Table": "`user`" + "Query": "select id, 1.1 from `user` group by 1.1 order by 1.1 asc" } ] }, @@ -1457,8 +1403,7 @@ "Sharded": true }, "FieldQuery": "select count(*) from (select `user`.col, user_extra.extra from `user`, user_extra where 1 != 1) as a where 1 != 1", - "Query": "select count(*) from (select `user`.col, user_extra.extra from `user`, user_extra where `user`.id = user_extra.user_id) as a", - "Table": "`user`, user_extra" + "Query": "select count(*) from (select `user`.col, user_extra.extra from `user`, user_extra where `user`.id = user_extra.user_id) as a" } ] }, @@ -1483,8 +1428,7 @@ "Sharded": true }, "FieldQuery": "select col from (select `user`.col, user_extra.extra from `user`, user_extra where 1 != 1) as a where 1 != 1", - "Query": "select col from (select `user`.col, user_extra.extra from `user`, user_extra where `user`.id = user_extra.user_id) as a", - "Table": "`user`, user_extra" + "Query": "select col from (select `user`.col, user_extra.extra from `user`, user_extra where `user`.id = user_extra.user_id) as a" }, "TablesUsed": [ "user.user", @@ -1514,8 +1458,7 @@ }, "FieldQuery": "select col, count(*) from (select `user`.col, user_extra.extra from `user`, user_extra where 1 != 1) as a where 1 != 1 group by col", "OrderBy": "0 ASC", - "Query": "select col, count(*) from (select `user`.col, user_extra.extra from `user`, user_extra where `user`.id = user_extra.user_id) as a group by col order by col asc", - "Table": "`user`, user_extra" + "Query": "select col, count(*) from (select `user`.col, user_extra.extra from `user`, user_extra where `user`.id = user_extra.user_id) as a group by col order by col asc" } ] }, @@ -1548,8 +1491,7 @@ "Sharded": true }, "FieldQuery": "select col1, col2, weight_string(col1), weight_string(col2) from `user` where 1 != 1", - "Query": "select distinct col1, col2, weight_string(col1), weight_string(col2) from `user`", - "Table": "`user`" + "Query": "select distinct col1, col2, weight_string(col1), weight_string(col2) from `user`" } ] }, @@ -1578,8 +1520,7 @@ "Sharded": true }, "FieldQuery": "select count(*) from `user` where 1 != 1", - "Query": "select count(*) from `user`", - "Table": "`user`" + "Query": "select count(*) from `user`" } ] }, @@ -1605,7 +1546,6 @@ "OperatorType": "Join", "Variant": "Join", "JoinColumnIndexes": "L:0,L:1", - "TableName": "`user`_user_extra", "Inputs": [ { "OperatorType": "Route", @@ -1616,8 +1556,7 @@ }, "FieldQuery": "select `user`.a, weight_string(`user`.a) from `user` where 1 != 1 group by `user`.a, weight_string(`user`.a)", "OrderBy": "(0|1) ASC", - "Query": "select `user`.a, weight_string(`user`.a) from `user` group by `user`.a, weight_string(`user`.a) order by `user`.a asc", - "Table": "`user`" + "Query": "select `user`.a, weight_string(`user`.a) from `user` group by `user`.a, weight_string(`user`.a) order by `user`.a asc" }, { "OperatorType": "Route", @@ -1627,8 +1566,7 @@ "Sharded": true }, "FieldQuery": "select 1 from user_extra where 1 != 1 group by .0", - "Query": "select 1 from user_extra group by .0", - "Table": "user_extra" + "Query": "select 1 from user_extra group by .0" } ] } @@ -1663,8 +1601,7 @@ }, "FieldQuery": "select col1, col2, col2, weight_string(col1), weight_string(col2) from `user` where 1 != 1 group by col1, col2, weight_string(col1), weight_string(col2)", "OrderBy": "(0|3) ASC, (1|4) ASC", - "Query": "select col1, col2, col2, weight_string(col1), weight_string(col2) from `user` group by col1, col2, weight_string(col1), weight_string(col2) order by col1 asc, col2 asc", - "Table": "`user`" + "Query": "select col1, col2, col2, weight_string(col1), weight_string(col2) from `user` group by col1, col2, weight_string(col1), weight_string(col2) order by col1 asc, col2 asc" } ] }, @@ -1700,8 +1637,7 @@ }, "FieldQuery": "select col, count(*) as k from `user` where 1 != 1 group by col", "OrderBy": "0 ASC", - "Query": "select col, count(*) as k from `user` group by col order by col asc", - "Table": "`user`" + "Query": "select col, count(*) as k from `user` group by col order by col asc" } ] } @@ -1734,8 +1670,7 @@ }, "FieldQuery": "select col, count(*) as k from `user` where 1 != 1 group by col", "OrderBy": "0 ASC", - "Query": "select col, count(*) as k from `user` group by col order by col asc", - "Table": "`user`" + "Query": "select col, count(*) as k from `user` group by col order by col asc" } ] }, @@ -1759,8 +1694,7 @@ "Sharded": true }, "FieldQuery": "select `user`.id, count(*) as c from `user`, user_extra where 1 != 1 group by `user`.id", - "Query": "select `user`.id, count(*) as c from `user`, user_extra where `user`.id = user_extra.user_id group by `user`.id having max(`user`.col) > 10", - "Table": "`user`, user_extra" + "Query": "select `user`.id, count(*) as c from `user`, user_extra where `user`.id = user_extra.user_id group by `user`.id having max(`user`.col) > 10" }, "TablesUsed": [ "user.user", @@ -1788,8 +1722,7 @@ "Sharded": true }, "FieldQuery": "select count(*) from `user` where 1 != 1", - "Query": "select count(*) from `user` where exists (select 1 from user_extra where user_id = `user`.id group by user_id having max(col) > 10)", - "Table": "`user`" + "Query": "select count(*) from `user` where exists (select 1 from user_extra where user_id = `user`.id group by user_id having max(col) > 10)" } ] }, @@ -1814,8 +1747,7 @@ "Sharded": true }, "FieldQuery": "select id from `user` where 1 != 1 group by id", - "Query": "select id from `user` group by id having count(id) = 10", - "Table": "`user`" + "Query": "select id from `user` group by id having count(id) = 10" }, "TablesUsed": [ "user.user" @@ -1844,8 +1776,7 @@ }, "FieldQuery": "select lower(col1) as v, count(*) from authoritative where 1 != 1 group by lower(col1)", "OrderBy": "0 ASC COLLATE latin1_swedish_ci", - "Query": "select lower(col1) as v, count(*) from authoritative group by lower(col1) order by lower(col1) asc", - "Table": "authoritative" + "Query": "select lower(col1) as v, count(*) from authoritative group by lower(col1) order by lower(col1) asc" } ] }, @@ -1876,8 +1807,7 @@ }, "FieldQuery": "select char_length(col1) as a, count(*) from authoritative where 1 != 1 group by char_length(col1)", "OrderBy": "0 ASC", - "Query": "select char_length(col1) as a, count(*) from authoritative group by char_length(col1) order by char_length(authoritative.col1) asc", - "Table": "authoritative" + "Query": "select char_length(col1) as a, count(*) from authoritative group by char_length(col1) order by char_length(authoritative.col1) asc" } ] }, @@ -1907,8 +1837,7 @@ "FieldQuery": "select id, weight_string(id) from `user` where 1 != 1", "OrderBy": "(0|1) ASC", "Query": "select id, weight_string(id) from `user` order by id asc limit 2", - "ResultColumns": 1, - "Table": "`user`" + "ResultColumns": 1 } ] }, @@ -1929,7 +1858,6 @@ "JoinVars": { "user_id": 1 }, - "TableName": "`user`_user_extra", "Inputs": [ { "InputName": "Outer", @@ -1942,8 +1870,7 @@ "FieldQuery": "select col, id, weight_string(id) from `user` where 1 != 1", "OrderBy": "(1|2) ASC", "Query": "select col, id, weight_string(id) from `user` order by `user`.id asc", - "ResultColumns": 2, - "Table": "`user`" + "ResultColumns": 2 }, { "InputName": "SubQuery", @@ -1955,7 +1882,6 @@ }, "FieldQuery": "select 1 from user_extra where 1 != 1", "Query": "select 1 from user_extra where user_id = 3 and user_id < :user_id limit 1", - "Table": "user_extra", "Values": [ "3" ], @@ -1993,8 +1919,7 @@ "Sharded": true }, "FieldQuery": "select count(*) as a from `user` where 1 != 1", - "Query": "select count(*) as a from `user`", - "Table": "`user`" + "Query": "select count(*) as a from `user`" } ] } @@ -2029,8 +1954,7 @@ "Sharded": true }, "FieldQuery": "select count(*) as a from `user` where 1 != 1", - "Query": "select count(*) as a from `user`", - "Table": "`user`" + "Query": "select count(*) as a from `user`" } ] } @@ -2065,8 +1989,7 @@ "Sharded": true }, "FieldQuery": "select count(*) as a from `user` where 1 != 1", - "Query": "select count(*) as a from `user`", - "Table": "`user`" + "Query": "select count(*) as a from `user`" } ] } @@ -2101,8 +2024,7 @@ "Sharded": true }, "FieldQuery": "select count(*) as a from `user` where 1 != 1", - "Query": "select count(*) as a from `user`", - "Table": "`user`" + "Query": "select count(*) as a from `user`" } ] } @@ -2137,8 +2059,7 @@ "Sharded": true }, "FieldQuery": "select count(*) as a from `user` where 1 != 1", - "Query": "select count(*) as a from `user`", - "Table": "`user`" + "Query": "select count(*) as a from `user`" } ] } @@ -2173,8 +2094,7 @@ "Sharded": true }, "FieldQuery": "select count(*) as a from `user` where 1 != 1", - "Query": "select count(*) as a from `user`", - "Table": "`user`" + "Query": "select count(*) as a from `user`" } ] } @@ -2209,8 +2129,7 @@ "Sharded": true }, "FieldQuery": "select count(*) as a from `user` where 1 != 1", - "Query": "select count(*) as a from `user`", - "Table": "`user`" + "Query": "select count(*) as a from `user`" } ] } @@ -2245,8 +2164,7 @@ "Sharded": true }, "FieldQuery": "select count(*) as a from `user` where 1 != 1", - "Query": "select count(*) as a from `user`", - "Table": "`user`" + "Query": "select count(*) as a from `user`" } ] } @@ -2284,8 +2202,7 @@ }, "FieldQuery": "select col1, count(*) as a, weight_string(col1) from `user` where 1 != 1 group by col1, weight_string(col1)", "OrderBy": "(0|2) ASC", - "Query": "select col1, count(*) as a, weight_string(col1) from `user` group by col1, weight_string(col1) order by col1 asc", - "Table": "`user`" + "Query": "select col1, count(*) as a, weight_string(col1) from `user` group by col1, weight_string(col1) order by col1 asc" } ] } @@ -2323,8 +2240,7 @@ }, "FieldQuery": "select count(*) as a, col2, weight_string(col2) from `user` where 1 != 1 group by col2, weight_string(col2)", "OrderBy": "(1|2) ASC", - "Query": "select count(*) as a, col2, weight_string(col2) from `user` group by col2, weight_string(col2) order by col2 asc", - "Table": "`user`" + "Query": "select count(*) as a, col2, weight_string(col2) from `user` group by col2, weight_string(col2) order by col2 asc" } ] } @@ -2351,7 +2267,6 @@ }, "FieldQuery": "select col1, udf_aggr(col2) as r from `user` where 1 != 1 group by col1", "Query": "select col1, udf_aggr(col2) as r from `user` where id = 1 group by col1 having udf_aggr(`user`.col2) >= 0.3", - "Table": "`user`", "Values": [ "1" ], @@ -2377,8 +2292,7 @@ "Sharded": true }, "FieldQuery": "select id, udf_aggr(col2) as r from `user` where 1 != 1 group by id", - "Query": "select id, udf_aggr(col2) as r from `user` group by id", - "Table": "`user`" + "Query": "select id, udf_aggr(col2) as r from `user` group by id" }, "TablesUsed": [ "user.user" @@ -2407,8 +2321,7 @@ }, "FieldQuery": "select col, textcol1 from `user` where 1 != 1 group by col, textcol1", "OrderBy": "0 ASC, 1 ASC COLLATE latin1_swedish_ci", - "Query": "select col, textcol1 from `user` group by col, textcol1 order by col asc, textcol1 asc", - "Table": "`user`" + "Query": "select col, textcol1 from `user` group by col, textcol1 order by col asc, textcol1 asc" } ] }, @@ -2455,7 +2368,6 @@ }, "FieldQuery": "select `name`, keyspace_id from name_user_vdx where 1 != 1", "Query": "select `name`, keyspace_id from name_user_vdx where `name` in ::__vals", - "Table": "name_user_vdx", "Values": [ "::name" ], @@ -2469,8 +2381,7 @@ "Sharded": true }, "FieldQuery": "select 1, count(id) from `user` where 1 != 1", - "Query": "select 1, count(id) from `user` where `name` = 'a'", - "Table": "`user`" + "Query": "select 1, count(id) from `user` where `name` = 'a'" } ] } @@ -2505,7 +2416,6 @@ "OperatorType": "Join", "Variant": "Join", "JoinColumnIndexes": "L:0,R:0", - "TableName": "`user`_user_extra", "Inputs": [ { "OperatorType": "Route", @@ -2515,8 +2425,7 @@ "Sharded": true }, "FieldQuery": "select count(*) from `user` where 1 != 1", - "Query": "select count(*) from `user`", - "Table": "`user`" + "Query": "select count(*) from `user`" }, { "OperatorType": "Route", @@ -2526,8 +2435,7 @@ "Sharded": true }, "FieldQuery": "select count(*) from user_extra where 1 != 1 group by .0", - "Query": "select count(*) from user_extra group by .0", - "Table": "user_extra" + "Query": "select count(*) from user_extra group by .0" } ] } @@ -2566,8 +2474,7 @@ "Sharded": true }, "FieldQuery": "select 1, count(id) from `user` where 1 != 1", - "Query": "select 1, count(id) from `user`", - "Table": "`user`" + "Query": "select 1, count(id) from `user`" } ] } @@ -2604,7 +2511,6 @@ "OperatorType": "Join", "Variant": "Join", "JoinColumnIndexes": "L:0,R:0,L:1,L:2", - "TableName": "`user`_user_extra", "Inputs": [ { "OperatorType": "Route", @@ -2615,8 +2521,7 @@ }, "FieldQuery": "select count(*), `user`.a, weight_string(`user`.a) from `user` where 1 != 1 group by `user`.a, weight_string(`user`.a)", "OrderBy": "(1|2) ASC", - "Query": "select count(*), `user`.a, weight_string(`user`.a) from `user` group by `user`.a, weight_string(`user`.a) order by `user`.a asc", - "Table": "`user`" + "Query": "select count(*), `user`.a, weight_string(`user`.a) from `user` group by `user`.a, weight_string(`user`.a) order by `user`.a asc" }, { "OperatorType": "Route", @@ -2626,8 +2531,7 @@ "Sharded": true }, "FieldQuery": "select count(*) from user_extra where 1 != 1 group by .0", - "Query": "select count(*) from user_extra group by .0", - "Table": "user_extra" + "Query": "select count(*) from user_extra group by .0" } ] } @@ -2667,7 +2571,6 @@ "OperatorType": "Join", "Variant": "Join", "JoinColumnIndexes": "R:0,L:0,L:1,L:2", - "TableName": "`user`_user_extra", "Inputs": [ { "OperatorType": "Route", @@ -2678,8 +2581,7 @@ }, "FieldQuery": "select count(*), `user`.a, weight_string(`user`.a) from `user` where 1 != 1 group by `user`.a, weight_string(`user`.a)", "OrderBy": "(1|2) ASC", - "Query": "select count(*), `user`.a, weight_string(`user`.a) from `user` group by `user`.a, weight_string(`user`.a) order by `user`.a asc", - "Table": "`user`" + "Query": "select count(*), `user`.a, weight_string(`user`.a) from `user` group by `user`.a, weight_string(`user`.a) order by `user`.a asc" }, { "OperatorType": "Route", @@ -2689,8 +2591,7 @@ "Sharded": true }, "FieldQuery": "select count(user_extra.a) from user_extra where 1 != 1 group by .0", - "Query": "select count(user_extra.a) from user_extra group by .0", - "Table": "user_extra" + "Query": "select count(user_extra.a) from user_extra group by .0" } ] } @@ -2739,7 +2640,6 @@ "JoinVars": { "u_foo": 2 }, - "TableName": "`user`_user_extra_unsharded", "Inputs": [ { "OperatorType": "Route", @@ -2749,8 +2649,7 @@ "Sharded": true }, "FieldQuery": "select count(u.textcol1), count(*), u.foo from `user` as u where 1 != 1 group by u.foo", - "Query": "select count(u.textcol1), count(*), u.foo from `user` as u group by u.foo", - "Table": "`user`" + "Query": "select count(u.textcol1), count(*), u.foo from `user` as u group by u.foo" }, { "OperatorType": "Projection", @@ -2768,7 +2667,6 @@ "JoinVars": { "ue_bar": 2 }, - "TableName": "user_extra_unsharded", "Inputs": [ { "OperatorType": "Route", @@ -2778,8 +2676,7 @@ "Sharded": true }, "FieldQuery": "select count(*), count(ue.foo), ue.bar from user_extra as ue where 1 != 1 group by ue.bar", - "Query": "select count(*), count(ue.foo), ue.bar from user_extra as ue where ue.bar = :u_foo group by ue.bar", - "Table": "user_extra" + "Query": "select count(*), count(ue.foo), ue.bar from user_extra as ue where ue.bar = :u_foo group by ue.bar" }, { "OperatorType": "Route", @@ -2789,8 +2686,7 @@ "Sharded": false }, "FieldQuery": "select count(*), us.bar, weight_string(us.bar) from unsharded as us where 1 != 1 group by us.bar, weight_string(us.bar)", - "Query": "select count(*), us.bar, weight_string(us.bar) from unsharded as us where us.baz = :ue_bar group by us.bar, weight_string(us.bar)", - "Table": "unsharded" + "Query": "select count(*), us.bar, weight_string(us.bar) from unsharded as us where us.baz = :ue_bar group by us.bar, weight_string(us.bar)" } ] } @@ -2834,8 +2730,7 @@ }, "FieldQuery": "select col1, min(id) as `min(distinct id)`, col3, weight_string(col1), weight_string(min(id)), weight_string(col3) from `user` where 1 != 1 group by col1, col3, weight_string(col1), weight_string(col3)", "OrderBy": "(0|3) ASC, (2|5) ASC", - "Query": "select col1, min(id) as `min(distinct id)`, col3, weight_string(col1), weight_string(min(id)), weight_string(col3) from `user` group by col1, col3, weight_string(col1), weight_string(col3) order by col1 asc, col3 asc", - "Table": "`user`" + "Query": "select col1, min(id) as `min(distinct id)`, col3, weight_string(col1), weight_string(min(id)), weight_string(col3) from `user` group by col1, col3, weight_string(col1), weight_string(col3) order by col1 asc, col3 asc" } ] }, @@ -2862,7 +2757,6 @@ "JoinVars": { "user_apa": 1 }, - "TableName": "`user`_user_extra", "Inputs": [ { "InputName": "Outer", @@ -2873,8 +2767,7 @@ "Sharded": true }, "FieldQuery": "select count(*), `user`.apa from `user` where 1 != 1 group by `user`.apa", - "Query": "select count(*), `user`.apa from `user` group by `user`.apa", - "Table": "`user`" + "Query": "select count(*), `user`.apa from `user` group by `user`.apa" }, { "InputName": "SubQuery", @@ -2889,8 +2782,7 @@ "Sharded": true }, "FieldQuery": "select 1 from user_extra where 1 != 1", - "Query": "select 1 from user_extra where user_extra.bar = :user_apa limit 1", - "Table": "user_extra" + "Query": "select 1 from user_extra where user_extra.bar = :user_apa limit 1" } ] } @@ -2927,8 +2819,7 @@ }, "FieldQuery": "select val2, val1, count(*), weight_string(val2), weight_string(val1) from `user` where 1 != 1 group by val2, val1, weight_string(val2), weight_string(val1)", "OrderBy": "(0|3) ASC, (1|4) ASC", - "Query": "select val2, val1, count(*), weight_string(val2), weight_string(val1) from `user` group by val2, val1, weight_string(val2), weight_string(val1) order by val2 asc, val1 asc", - "Table": "`user`" + "Query": "select val2, val1, count(*), weight_string(val2), weight_string(val1) from `user` group by val2, val1, weight_string(val2), weight_string(val1) order by val2 asc, val1 asc" } ] }, @@ -2960,8 +2851,7 @@ }, "FieldQuery": "select ascii(col2) as a, count(*), weight_string(ascii(col2)) from `user` where 1 != 1 group by ascii(col2), weight_string(ascii(col2))", "OrderBy": "(0|2) ASC", - "Query": "select ascii(col2) as a, count(*), weight_string(ascii(col2)) from `user` group by ascii(col2), weight_string(ascii(col2)) order by ascii(col2) asc", - "Table": "`user`" + "Query": "select ascii(col2) as a, count(*), weight_string(ascii(col2)) from `user` group by ascii(col2), weight_string(ascii(col2)) order by ascii(col2) asc" } ] }, @@ -2993,8 +2883,7 @@ }, "FieldQuery": "select tcol1, tcol2, tcol2, weight_string(tcol1), weight_string(tcol2) from `user` where 1 != 1 group by tcol1, tcol2, weight_string(tcol1), weight_string(tcol2)", "OrderBy": "(0|3) ASC, (1|4) ASC", - "Query": "select tcol1, tcol2, tcol2, weight_string(tcol1), weight_string(tcol2) from `user` group by tcol1, tcol2, weight_string(tcol1), weight_string(tcol2) order by tcol1 asc, tcol2 asc", - "Table": "`user`" + "Query": "select tcol1, tcol2, tcol2, weight_string(tcol1), weight_string(tcol2) from `user` group by tcol1, tcol2, weight_string(tcol1), weight_string(tcol2) order by tcol1 asc, tcol2 asc" } ] }, @@ -3026,8 +2915,7 @@ }, "FieldQuery": "select tcol2, tcol1, count(*), tcol2, weight_string(tcol1), weight_string(tcol2) from `user` where 1 != 1 group by tcol1, tcol2, weight_string(tcol1), weight_string(tcol2)", "OrderBy": "(1|4) ASC, (0|5) ASC", - "Query": "select tcol2, tcol1, count(*), tcol2, weight_string(tcol1), weight_string(tcol2) from `user` group by tcol1, tcol2, weight_string(tcol1), weight_string(tcol2) order by tcol1 asc, tcol2 asc", - "Table": "`user`" + "Query": "select tcol2, tcol1, count(*), tcol2, weight_string(tcol1), weight_string(tcol2) from `user` group by tcol1, tcol2, weight_string(tcol1), weight_string(tcol2) order by tcol1 asc, tcol2 asc" } ] }, @@ -3057,7 +2945,6 @@ "JoinVars": { "u2_val2": 2 }, - "TableName": "`user`_`user`_music", "Inputs": [ { "OperatorType": "Join", @@ -3066,7 +2953,6 @@ "JoinVars": { "u_val2": 1 }, - "TableName": "`user`_`user`", "Inputs": [ { "OperatorType": "Route", @@ -3077,8 +2963,7 @@ }, "FieldQuery": "select u.textcol1, u.val2, weight_string(u.val2) from `user` as u where 1 != 1", "OrderBy": "0 ASC COLLATE latin1_swedish_ci, (1|2) ASC", - "Query": "select u.textcol1, u.val2, weight_string(u.val2) from `user` as u order by u.textcol1 asc, u.val2 asc", - "Table": "`user`" + "Query": "select u.textcol1, u.val2, weight_string(u.val2) from `user` as u order by u.textcol1 asc, u.val2 asc" }, { "OperatorType": "Route", @@ -3089,7 +2974,6 @@ }, "FieldQuery": "select u2.val2 from `user` as u2 where 1 != 1", "Query": "select u2.val2 from `user` as u2 where u2.id = :u_val2", - "Table": "`user`", "Values": [ ":u_val2" ], @@ -3118,7 +3002,6 @@ }, "FieldQuery": "select `name`, keyspace_id from name_user_vdx where 1 != 1", "Query": "select `name`, keyspace_id from name_user_vdx where `name` in ::__vals", - "Table": "name_user_vdx", "Values": [ "::name" ], @@ -3132,8 +3015,7 @@ "Sharded": true }, "FieldQuery": "select 1 from music as m where 1 != 1", - "Query": "select 1 from music as m where m.id = :u2_val2", - "Table": "music" + "Query": "select 1 from music as m where m.id = :u2_val2" } ] } @@ -3162,8 +3044,7 @@ "Sharded": true }, "FieldQuery": "select group_concat(user_id order by `name` asc), id from `user` where 1 != 1 group by id", - "Query": "select group_concat(user_id order by `name` asc), id from `user` group by id", - "Table": "`user`" + "Query": "select group_concat(user_id order by `name` asc), id from `user` group by id" }, "TablesUsed": [ "user.user" @@ -3185,8 +3066,7 @@ "Sharded": false }, "FieldQuery": "select count(distinct user_id, `name`) from unsharded where 1 != 1", - "Query": "select count(distinct user_id, `name`) from unsharded", - "Table": "unsharded" + "Query": "select count(distinct user_id, `name`) from unsharded" }, "TablesUsed": [ "main.unsharded" @@ -3215,7 +3095,6 @@ "OperatorType": "Join", "Variant": "Join", "JoinColumnIndexes": "L:0,R:0", - "TableName": "`user`_user_extra", "Inputs": [ { "OperatorType": "Route", @@ -3225,8 +3104,7 @@ "Sharded": true }, "FieldQuery": "select sum(col) from (select `user`.col as col, 32 from `user` where 1 != 1) as t where 1 != 1", - "Query": "select sum(col) from (select `user`.col as col, 32 from `user`) as t", - "Table": "`user`" + "Query": "select sum(col) from (select `user`.col as col, 32 from `user`) as t" }, { "OperatorType": "Route", @@ -3236,8 +3114,7 @@ "Sharded": true }, "FieldQuery": "select count(*) from user_extra where 1 != 1 group by .0", - "Query": "select count(*) from user_extra group by .0", - "Table": "user_extra" + "Query": "select count(*) from user_extra group by .0" } ] } @@ -3278,8 +3155,7 @@ }, "FieldQuery": "select foo, count(*), weight_string(foo) from `user` where 1 != 1 group by foo, weight_string(foo)", "OrderBy": "(0|2) ASC", - "Query": "select foo, count(*), weight_string(foo) from `user` group by foo, weight_string(foo) order by foo asc", - "Table": "`user`" + "Query": "select foo, count(*), weight_string(foo) from `user` group by foo, weight_string(foo) order by foo asc" } ] } @@ -3317,8 +3193,7 @@ }, "FieldQuery": "select foo, sum(foo), sum(bar), weight_string(foo) from `user` where 1 != 1 group by foo, weight_string(foo)", "OrderBy": "(0|3) ASC", - "Query": "select foo, sum(foo), sum(bar), weight_string(foo) from `user` group by foo, weight_string(foo) order by foo asc", - "Table": "`user`" + "Query": "select foo, sum(foo), sum(bar), weight_string(foo) from `user` group by foo, weight_string(foo) order by foo asc" } ] } @@ -3356,8 +3231,7 @@ }, "FieldQuery": "select foo, sum(foo) as fooSum, sum(bar) as barSum, weight_string(foo) from `user` where 1 != 1 group by foo, weight_string(foo)", "OrderBy": "(0|3) ASC", - "Query": "select foo, sum(foo) as fooSum, sum(bar) as barSum, weight_string(foo) from `user` group by foo, weight_string(foo) order by foo asc", - "Table": "`user`" + "Query": "select foo, sum(foo) as fooSum, sum(bar) as barSum, weight_string(foo) from `user` group by foo, weight_string(foo) order by foo asc" } ] } @@ -3395,8 +3269,7 @@ }, "FieldQuery": "select foo, count(*), weight_string(foo) from `user` where 1 != 1 group by foo, weight_string(foo)", "OrderBy": "(0|2) ASC", - "Query": "select foo, count(*), weight_string(foo) from `user` group by foo, weight_string(foo) order by foo asc", - "Table": "`user`" + "Query": "select foo, count(*), weight_string(foo) from `user` group by foo, weight_string(foo) order by foo asc" } ] } @@ -3445,7 +3318,6 @@ "JoinVars": { "ue_id": 1 }, - "TableName": "user_extra_`user`", "Inputs": [ { "OperatorType": "Route", @@ -3455,8 +3327,7 @@ "Sharded": true }, "FieldQuery": "select count(*), ue.id from user_extra as ue where 1 != 1 group by ue.id", - "Query": "select count(*), ue.id from user_extra as ue group by ue.id", - "Table": "user_extra" + "Query": "select count(*), ue.id from user_extra as ue group by ue.id" }, { "OperatorType": "Route", @@ -3467,7 +3338,6 @@ }, "FieldQuery": "select count(u.`name`), u.id, weight_string(u.id) from `user` as u where 1 != 1 group by u.id, weight_string(u.id)", "Query": "select count(u.`name`), u.id, weight_string(u.id) from `user` as u where u.id = :ue_id group by u.id, weight_string(u.id)", - "Table": "`user`", "Values": [ ":ue_id" ], @@ -3504,8 +3374,7 @@ "Sharded": true }, "FieldQuery": "select u.id from `user` as u, user_extra as ue where 1 != 1 group by u.id", - "Query": "select u.id from `user` as u, user_extra as ue where ue.user_id = u.id group by u.id having count(u.`name`) = 3", - "Table": "`user`, user_extra" + "Query": "select u.id from `user` as u, user_extra as ue where ue.user_id = u.id group by u.id having count(u.`name`) = 3" }, "TablesUsed": [ "user.user", @@ -3551,7 +3420,6 @@ "JoinVars": { "ue_id": 1 }, - "TableName": "user_extra_`user`", "Inputs": [ { "OperatorType": "Route", @@ -3561,8 +3429,7 @@ "Sharded": true }, "FieldQuery": "select count(*), ue.id from user_extra as ue where 1 != 1 group by ue.id", - "Query": "select count(*), ue.id from user_extra as ue group by ue.id", - "Table": "user_extra" + "Query": "select count(*), ue.id from user_extra as ue group by ue.id" }, { "OperatorType": "Route", @@ -3573,7 +3440,6 @@ }, "FieldQuery": "select count(*), u.id, weight_string(u.id) from `user` as u where 1 != 1 group by u.id, weight_string(u.id)", "Query": "select count(*), u.id, weight_string(u.id) from `user` as u where u.id = :ue_id group by u.id, weight_string(u.id)", - "Table": "`user`", "Values": [ ":ue_id" ], @@ -3616,7 +3482,6 @@ "JoinVars": { "user_col": 0 }, - "TableName": "`user`_user_extra", "Inputs": [ { "OperatorType": "Route", @@ -3627,8 +3492,7 @@ }, "FieldQuery": "select `user`.col, `user`.id, weight_string(`user`.id) from `user` where 1 != 1 group by `user`.id, `user`.col, weight_string(`user`.id)", "OrderBy": "(1|2) ASC", - "Query": "select `user`.col, `user`.id, weight_string(`user`.id) from `user` group by `user`.id, `user`.col, weight_string(`user`.id) order by `user`.id asc", - "Table": "`user`" + "Query": "select `user`.col, `user`.id, weight_string(`user`.id) from `user` group by `user`.id, `user`.col, weight_string(`user`.id) order by `user`.id asc" }, { "OperatorType": "Route", @@ -3638,8 +3502,7 @@ "Sharded": true }, "FieldQuery": "select 1 from user_extra where 1 != 1 group by .0", - "Query": "select 1 from user_extra where user_extra.col = :user_col /* INT16 */ group by .0", - "Table": "user_extra" + "Query": "select 1 from user_extra where user_extra.col = :user_col /* INT16 */ group by .0" } ] } @@ -3676,8 +3539,7 @@ "Sharded": true }, "FieldQuery": "select id, count(*) from `user` where 1 != 1", - "Query": "select id, count(*) from `user`", - "Table": "`user`" + "Query": "select id, count(*) from `user`" } ] }, @@ -3703,7 +3565,6 @@ "OperatorType": "Join", "Variant": "Join", "JoinColumnIndexes": "L:0,L:1", - "TableName": "`user`_user_extra", "Inputs": [ { "OperatorType": "Route", @@ -3714,8 +3575,7 @@ }, "FieldQuery": "select `user`.id, weight_string(`user`.id) from `user` where 1 != 1 group by `user`.id, weight_string(`user`.id)", "OrderBy": "(0|1) ASC", - "Query": "select `user`.id, weight_string(`user`.id) from `user` group by `user`.id, weight_string(`user`.id) order by `user`.id asc", - "Table": "`user`" + "Query": "select `user`.id, weight_string(`user`.id) from `user` group by `user`.id, weight_string(`user`.id) order by `user`.id asc" }, { "OperatorType": "Route", @@ -3725,8 +3585,7 @@ "Sharded": true }, "FieldQuery": "select 1 from user_extra where 1 != 1 group by .0", - "Query": "select 1 from user_extra group by .0", - "Table": "user_extra" + "Query": "select 1 from user_extra group by .0" } ] } @@ -3766,8 +3625,7 @@ "Sharded": true }, "FieldQuery": "select x.phone, x.id, x.city from (select phone, id, city from `user` where 1 != 1) as x where 1 != 1", - "Query": "select x.phone, x.id, x.city from (select phone, id, city from `user` where id > 12) as x limit 10", - "Table": "`user`" + "Query": "select x.phone, x.id, x.city from (select phone, id, city from `user` where id > 12) as x limit 10" } ] } @@ -3810,8 +3668,7 @@ "Sharded": true }, "FieldQuery": "select 1 from (select phone, id, city from `user` where 1 != 1) as x where 1 != 1", - "Query": "select 1 from (select phone, id, city from `user` where id > 12) as x limit 10", - "Table": "`user`" + "Query": "select 1 from (select phone, id, city from `user` where id > 12) as x limit 10" } ] } @@ -3847,7 +3704,6 @@ "JoinVars": { "user_id": 0 }, - "TableName": "`user`_user_extra", "Inputs": [ { "OperatorType": "Limit", @@ -3861,8 +3717,7 @@ "Sharded": true }, "FieldQuery": "select x.`user.id` from (select `user`.id as `user.id` from `user` where 1 != 1) as x where 1 != 1", - "Query": "select x.`user.id` from (select `user`.id as `user.id` from `user`) as x limit 10", - "Table": "`user`" + "Query": "select x.`user.id` from (select `user`.id as `user.id` from `user`) as x limit 10" } ] }, @@ -3878,8 +3733,7 @@ "Sharded": true }, "FieldQuery": "select x.col from (select user_extra.col as col from user_extra where 1 != 1) as x where 1 != 1", - "Query": "select x.col from (select user_extra.col as col from user_extra where user_extra.id = :user_id) as x limit 10", - "Table": "user_extra" + "Query": "select x.col from (select user_extra.col as col from user_extra where user_extra.id = :user_id) as x limit 10" } ] } @@ -3930,8 +3784,7 @@ }, "FieldQuery": "select x.id, x.val1, weight_string(x.val1) from (select id, val1 from `user` where 1 != 1) as x where 1 != 1", "OrderBy": "(1|2) ASC", - "Query": "select x.id, x.val1, weight_string(x.val1) from (select id, val1 from `user` where val2 < 4) as x order by x.val1 asc limit 2", - "Table": "`user`" + "Query": "select x.id, x.val1, weight_string(x.val1) from (select id, val1 from `user` where val2 < 4) as x order by x.val1 asc limit 2" } ] } @@ -3982,8 +3835,7 @@ "Sharded": true }, "FieldQuery": "select id, count(*), 1 from `user` where 1 != 1", - "Query": "select id, count(*), 1 from `user`", - "Table": "`user`" + "Query": "select id, count(*), 1 from `user`" } ] } @@ -4026,8 +3878,7 @@ }, "FieldQuery": "select `user`.intcol, count(`user`.intcol) from `user` where 1 != 1 group by `user`.intcol", "OrderBy": "0 ASC", - "Query": "select `user`.intcol, count(`user`.intcol) from `user` group by `user`.intcol order by `user`.intcol asc", - "Table": "`user`" + "Query": "select `user`.intcol, count(`user`.intcol) from `user` group by `user`.intcol order by `user`.intcol asc" } ] } @@ -4073,7 +3924,6 @@ "JoinVars": { "m_order": 1 }, - "TableName": "user_extra_`user`", "Inputs": [ { "OperatorType": "Route", @@ -4083,8 +3933,7 @@ "Sharded": true }, "FieldQuery": "select count(m.predef1), m.`order` from user_extra as m where 1 != 1 group by m.`order`", - "Query": "select count(m.predef1), m.`order` from user_extra as m group by m.`order`", - "Table": "user_extra" + "Query": "select count(m.predef1), m.`order` from user_extra as m group by m.`order`" }, { "OperatorType": "Route", @@ -4095,7 +3944,6 @@ }, "FieldQuery": "select u.`name`, count(*), u.id, weight_string(u.id) from `user` as u where 1 != 1 group by u.id, weight_string(u.id)", "Query": "select u.`name`, count(*), u.id, weight_string(u.id) from `user` as u where u.id = :m_order group by u.id, weight_string(u.id)", - "Table": "`user`", "Values": [ ":m_order" ], @@ -4140,7 +3988,6 @@ "JoinVars": { "u_col": 1 }, - "TableName": "`user`_user_extra", "Inputs": [ { "OperatorType": "Route", @@ -4150,8 +3997,7 @@ "Sharded": true }, "FieldQuery": "select count(u.id), u.col from `user` as u where 1 != 1 group by u.col", - "Query": "select count(u.id), u.col from `user` as u group by u.col", - "Table": "`user`" + "Query": "select count(u.id), u.col from `user` as u group by u.col" }, { "OperatorType": "Route", @@ -4161,8 +4007,7 @@ "Sharded": true }, "FieldQuery": "select count(*) from user_extra as ue where 1 != 1 group by .0", - "Query": "select count(*) from user_extra as ue where ue.col = :u_col /* INT16 */ group by .0", - "Table": "user_extra" + "Query": "select count(*) from user_extra as ue where ue.col = :u_col /* INT16 */ group by .0" } ] } @@ -4201,7 +4046,6 @@ "JoinVars": { "u_col": 1 }, - "TableName": "`user`_user_extra", "Inputs": [ { "OperatorType": "Route", @@ -4211,8 +4055,7 @@ "Sharded": true }, "FieldQuery": "select count(*), u.col from `user` as u where 1 != 1 group by u.col", - "Query": "select count(*), u.col from `user` as u group by u.col", - "Table": "`user`" + "Query": "select count(*), u.col from `user` as u group by u.col" }, { "OperatorType": "Route", @@ -4222,8 +4065,7 @@ "Sharded": true }, "FieldQuery": "select count(ue.id) from user_extra as ue where 1 != 1 group by .0", - "Query": "select count(ue.id) from user_extra as ue where ue.col = :u_col /* INT16 */ group by .0", - "Table": "user_extra" + "Query": "select count(ue.id) from user_extra as ue where ue.col = :u_col /* INT16 */ group by .0" } ] } @@ -4265,8 +4107,7 @@ "Sharded": true }, "FieldQuery": "select sum(a) as a, sum(b) as b from `user` where 1 != 1", - "Query": "select sum(a) as a, sum(b) as b from `user`", - "Table": "`user`" + "Query": "select sum(a) as a, sum(b) as b from `user`" } ] } @@ -4292,8 +4133,7 @@ "Sharded": true }, "FieldQuery": "select t1.portalId, t1.flowId from (select portalId, flowId, count(*) as `count` from user_extra where 1 != 1 group by user_id, flowId) as t1 where 1 != 1", - "Query": "select t1.portalId, t1.flowId from (select portalId, flowId, count(*) as `count` from user_extra where localDate > :v1 group by user_id, flowId) as t1 where `count` >= :v2", - "Table": "user_extra" + "Query": "select t1.portalId, t1.flowId from (select portalId, flowId, count(*) as `count` from user_extra where localDate > :v1 group by user_id, flowId) as t1 where `count` >= :v2" }, "TablesUsed": [ "user.user_extra" @@ -4327,8 +4167,7 @@ }, "FieldQuery": "select foo, max(baz) as bazo, weight_string(foo), weight_string(max(baz)) from (select foo, baz from `user` where 1 != 1) as f where 1 != 1 group by foo, weight_string(foo)", "OrderBy": "(0|2) ASC", - "Query": "select foo, max(baz) as bazo, weight_string(foo), weight_string(max(baz)) from (select foo, baz from `user`) as f group by foo, weight_string(foo) order by foo asc", - "Table": "`user`" + "Query": "select foo, max(baz) as bazo, weight_string(foo), weight_string(max(baz)) from (select foo, baz from `user`) as f group by foo, weight_string(foo) order by foo asc" } ] } @@ -4366,8 +4205,7 @@ }, "FieldQuery": "select foo, count(baz) as bazo, weight_string(foo) from (select foo, baz from `user` where 1 != 1) as f where 1 != 1 group by foo, weight_string(foo)", "OrderBy": "(0|2) ASC", - "Query": "select foo, count(baz) as bazo, weight_string(foo) from (select foo, baz from `user`) as f group by foo, weight_string(foo) order by foo asc", - "Table": "`user`" + "Query": "select foo, count(baz) as bazo, weight_string(foo) from (select foo, baz from `user`) as f group by foo, weight_string(foo) order by foo asc" } ] } @@ -4406,8 +4244,7 @@ }, "FieldQuery": "select col, count(*), col + 1 from `user` where 1 != 1 group by col", "OrderBy": "0 ASC", - "Query": "select col, count(*), col + 1 from `user` group by col order by col asc", - "Table": "`user`" + "Query": "select col, count(*), col + 1 from `user` group by col order by col asc" } ] } @@ -4435,8 +4272,7 @@ "FieldQuery": "select id, id + 1, weight_string(id + 1) from `user` where 1 != 1 group by id", "OrderBy": "(1|2) ASC", "Query": "select id, id + 1, weight_string(id + 1) from `user` group by id order by id + 1 asc", - "ResultColumns": 1, - "Table": "`user`" + "ResultColumns": 1 }, "TablesUsed": [ "user.user" @@ -4466,8 +4302,7 @@ }, "FieldQuery": "select a, a + 1, weight_string(a + 1) from `user` where 1 != 1 group by a + 1, weight_string(a + 1)", "OrderBy": "(1|2) ASC", - "Query": "select a, a + 1, weight_string(a + 1) from `user` group by a + 1, weight_string(a + 1) order by a + 1 asc", - "Table": "`user`" + "Query": "select a, a + 1, weight_string(a + 1) from `user` group by a + 1, weight_string(a + 1) order by a + 1 asc" } ] }, @@ -4501,7 +4336,6 @@ "JoinVars": { "user_foo": 1 }, - "TableName": "`user`_music", "Inputs": [ { "OperatorType": "Route", @@ -4511,8 +4345,7 @@ "Sharded": true }, "FieldQuery": "select count(*), `user`.foo from `user` where 1 != 1 group by `user`.foo", - "Query": "select count(*), `user`.foo from `user` group by `user`.foo", - "Table": "`user`" + "Query": "select count(*), `user`.foo from `user` group by `user`.foo" }, { "OperatorType": "Route", @@ -4522,8 +4355,7 @@ "Sharded": true }, "FieldQuery": "select count(*) from music where 1 != 1 group by .0", - "Query": "select count(*) from music where music.bar = :user_foo group by .0", - "Table": "music" + "Query": "select count(*) from music where music.bar = :user_foo group by .0" } ] } @@ -4562,7 +4394,6 @@ "JoinVars": { "user_foo": 1 }, - "TableName": "`user`_music", "Inputs": [ { "OperatorType": "Route", @@ -4572,8 +4403,7 @@ "Sharded": true }, "FieldQuery": "select count(*), `user`.foo from `user` where 1 != 1 group by `user`.foo", - "Query": "select count(*), `user`.foo from `user` group by `user`.foo", - "Table": "`user`" + "Query": "select count(*), `user`.foo from `user` group by `user`.foo" }, { "OperatorType": "Route", @@ -4583,8 +4413,7 @@ "Sharded": true }, "FieldQuery": "select count(*) from music where 1 != 1 group by .0", - "Query": "select count(*) from music where music.bar = :user_foo group by .0", - "Table": "music" + "Query": "select count(*) from music where music.bar = :user_foo group by .0" } ] } @@ -4626,7 +4455,6 @@ "JoinVars": { "user_foo": 2 }, - "TableName": "`user`_music", "Inputs": [ { "OperatorType": "Route", @@ -4637,8 +4465,7 @@ }, "FieldQuery": "select count(*), `user`.col, `user`.foo from `user` where 1 != 1 group by `user`.col, `user`.foo", "OrderBy": "1 ASC", - "Query": "select count(*), `user`.col, `user`.foo from `user` group by `user`.col, `user`.foo order by `user`.col asc", - "Table": "`user`" + "Query": "select count(*), `user`.col, `user`.foo from `user` group by `user`.col, `user`.foo order by `user`.col asc" }, { "OperatorType": "Route", @@ -4648,8 +4475,7 @@ "Sharded": true }, "FieldQuery": "select count(*) from music where 1 != 1 group by .0", - "Query": "select count(*) from music where music.bar = :user_foo group by .0", - "Table": "music" + "Query": "select count(*) from music where music.bar = :user_foo group by .0" } ] } @@ -4697,7 +4523,6 @@ "JoinVars": { "user_foo": 1 }, - "TableName": "`user`_music", "Inputs": [ { "OperatorType": "Route", @@ -4707,8 +4532,7 @@ "Sharded": true }, "FieldQuery": "select count(*), `user`.foo from `user` where 1 != 1 group by `user`.foo", - "Query": "select count(*), `user`.foo from `user` group by `user`.foo", - "Table": "`user`" + "Query": "select count(*), `user`.foo from `user` group by `user`.foo" }, { "OperatorType": "Route", @@ -4718,8 +4542,7 @@ "Sharded": true }, "FieldQuery": "select count(*), music.col, weight_string(music.col) from music where 1 != 1 group by music.col, weight_string(music.col)", - "Query": "select count(*), music.col, weight_string(music.col) from music where music.bar = :user_foo group by music.col, weight_string(music.col)", - "Table": "music" + "Query": "select count(*), music.col, weight_string(music.col) from music where music.bar = :user_foo group by music.col, weight_string(music.col)" } ] } @@ -4763,7 +4586,6 @@ "JoinVars": { "user_foo": 2 }, - "TableName": "`user`_music", "Inputs": [ { "OperatorType": "Route", @@ -4774,8 +4596,7 @@ }, "FieldQuery": "select count(*), `user`.col, `user`.foo from `user` where 1 != 1 group by `user`.col, `user`.foo", "OrderBy": "1 ASC", - "Query": "select count(*), `user`.col, `user`.foo from `user` group by `user`.col, `user`.foo order by `user`.col asc", - "Table": "`user`" + "Query": "select count(*), `user`.col, `user`.foo from `user` group by `user`.col, `user`.foo order by `user`.col asc" }, { "OperatorType": "Route", @@ -4785,8 +4606,7 @@ "Sharded": true }, "FieldQuery": "select count(*) from music where 1 != 1 group by .0", - "Query": "select count(*) from music where music.bar = :user_foo group by .0", - "Table": "music" + "Query": "select count(*) from music where music.bar = :user_foo group by .0" } ] } @@ -4834,7 +4654,6 @@ "JoinVars": { "user_foo": 1 }, - "TableName": "`user`_music", "Inputs": [ { "OperatorType": "Route", @@ -4844,8 +4663,7 @@ "Sharded": true }, "FieldQuery": "select count(*), `user`.foo from `user` where 1 != 1 group by `user`.foo", - "Query": "select count(*), `user`.foo from `user` group by `user`.foo", - "Table": "`user`" + "Query": "select count(*), `user`.foo from `user` group by `user`.foo" }, { "OperatorType": "Route", @@ -4855,8 +4673,7 @@ "Sharded": true }, "FieldQuery": "select count(*), music.col, weight_string(music.col) from music where 1 != 1 group by music.col, weight_string(music.col)", - "Query": "select count(*), music.col, weight_string(music.col) from music where music.bar = :user_foo group by music.col, weight_string(music.col)", - "Table": "music" + "Query": "select count(*), music.col, weight_string(music.col) from music where music.bar = :user_foo group by music.col, weight_string(music.col)" } ] } @@ -4897,7 +4714,6 @@ "JoinVars": { "user_extra_baz": 1 }, - "TableName": "user_extra_`user`_music", "Inputs": [ { "OperatorType": "Route", @@ -4907,8 +4723,7 @@ "Sharded": true }, "FieldQuery": "select count(*), user_extra.baz from user_extra where 1 != 1 group by user_extra.baz", - "Query": "select count(*), user_extra.baz from user_extra group by user_extra.baz", - "Table": "user_extra" + "Query": "select count(*), user_extra.baz from user_extra group by user_extra.baz" }, { "OperatorType": "Projection", @@ -4923,7 +4738,6 @@ "JoinVars": { "user_foo": 1 }, - "TableName": "`user`_music", "Inputs": [ { "OperatorType": "Route", @@ -4933,8 +4747,7 @@ "Sharded": true }, "FieldQuery": "select count(*), `user`.foo from `user` where 1 != 1 group by `user`.foo", - "Query": "select count(*), `user`.foo from `user` where `user`.foo = :user_extra_baz group by `user`.foo", - "Table": "`user`" + "Query": "select count(*), `user`.foo from `user` where `user`.foo = :user_extra_baz group by `user`.foo" }, { "OperatorType": "Route", @@ -4944,8 +4757,7 @@ "Sharded": true }, "FieldQuery": "select count(*) from music where 1 != 1 group by .0", - "Query": "select count(*) from music where music.bar = :user_foo group by .0", - "Table": "music" + "Query": "select count(*) from music where music.bar = :user_foo group by .0" } ] } @@ -4989,7 +4801,6 @@ "JoinVars": { "user_foo": 1 }, - "TableName": "`user`_music_user_extra", "Inputs": [ { "OperatorType": "Projection", @@ -5005,7 +4816,6 @@ "JoinVars": { "user_foo": 1 }, - "TableName": "`user`_music", "Inputs": [ { "OperatorType": "Route", @@ -5015,8 +4825,7 @@ "Sharded": true }, "FieldQuery": "select count(*), `user`.foo from `user` where 1 != 1 group by `user`.foo", - "Query": "select count(*), `user`.foo from `user` group by `user`.foo", - "Table": "`user`" + "Query": "select count(*), `user`.foo from `user` group by `user`.foo" }, { "OperatorType": "Route", @@ -5026,8 +4835,7 @@ "Sharded": true }, "FieldQuery": "select count(*) from music where 1 != 1 group by .0", - "Query": "select count(*) from music where music.bar = :user_foo group by .0", - "Table": "music" + "Query": "select count(*) from music where music.bar = :user_foo group by .0" } ] } @@ -5041,8 +4849,7 @@ "Sharded": true }, "FieldQuery": "select count(*) from user_extra where 1 != 1 group by .0", - "Query": "select count(*) from user_extra where user_extra.baz = :user_foo group by .0", - "Table": "user_extra" + "Query": "select count(*) from user_extra where user_extra.baz = :user_foo group by .0" } ] } @@ -5082,7 +4889,6 @@ "OperatorType": "Join", "Variant": "Join", "JoinColumnIndexes": "L:0,R:0,L:1,L:2", - "TableName": "`user`_music", "Inputs": [ { "OperatorType": "Route", @@ -5093,8 +4899,7 @@ }, "FieldQuery": "select count(*), u.col, u.intcol from `user` as u where 1 != 1 group by u.col, u.intcol", "OrderBy": "2 ASC, 1 ASC", - "Query": "select count(*), u.col, u.intcol from `user` as u group by u.col, u.intcol order by u.intcol asc, u.col asc", - "Table": "`user`" + "Query": "select count(*), u.col, u.intcol from `user` as u group by u.col, u.intcol order by u.intcol asc, u.col asc" }, { "OperatorType": "Route", @@ -5104,8 +4909,7 @@ "Sharded": true }, "FieldQuery": "select count(*) from music where 1 != 1 group by .0", - "Query": "select count(*) from music group by .0", - "Table": "music" + "Query": "select count(*) from music group by .0" } ] } @@ -5134,8 +4938,7 @@ "Sharded": true }, "FieldQuery": "select col, val, id from `user` where 1 != 1 group by col, val, id", - "Query": "select col, val, id from `user` group by col, val, id", - "Table": "`user`" + "Query": "select col, val, id from `user` group by col, val, id" }, "TablesUsed": [ "user.user" @@ -5165,8 +4968,7 @@ "Sharded": true }, "FieldQuery": "select a, b as a, weight_string(a), weight_string(b) from `user` where 1 != 1", - "Query": "select distinct a, b as a, weight_string(a), weight_string(b) from `user`", - "Table": "`user`" + "Query": "select distinct a, b as a, weight_string(a), weight_string(b) from `user`" } ] }, @@ -5197,8 +4999,7 @@ "Sharded": true }, "FieldQuery": "select a + 1, weight_string(a + 1) from `user` where 1 != 1", - "Query": "select distinct a + 1, weight_string(a + 1) from `user`", - "Table": "`user`" + "Query": "select distinct a + 1, weight_string(a + 1) from `user`" } ] }, @@ -5236,8 +5037,7 @@ }, "FieldQuery": "select count(*), col from `user` where 1 != 1 group by col", "OrderBy": "1 ASC", - "Query": "select count(*), col from `user` group by col order by col asc", - "Table": "`user`" + "Query": "select count(*), col from `user` group by col order by col asc" } ] } @@ -5270,8 +5070,7 @@ }, "FieldQuery": "select min(textcol1), max(textcol2), textcol1, textcol1, weight_string(max(textcol2)) from `user` where 1 != 1 group by textcol1", "OrderBy": "2 ASC COLLATE latin1_swedish_ci", - "Query": "select min(textcol1), max(textcol2), textcol1, textcol1, weight_string(max(textcol2)) from `user` group by textcol1 order by textcol1 asc", - "Table": "`user`" + "Query": "select min(textcol1), max(textcol2), textcol1, textcol1, weight_string(max(textcol2)) from `user` group by textcol1 order by textcol1 asc" } ] }, @@ -5303,8 +5102,7 @@ }, "FieldQuery": "select col, min(textcol1), max(textcol2), textcol1, textcol1, weight_string(max(textcol2)) from `user` where 1 != 1 group by col, textcol1", "OrderBy": "0 ASC, 3 ASC COLLATE latin1_swedish_ci", - "Query": "select col, min(textcol1), max(textcol2), textcol1, textcol1, weight_string(max(textcol2)) from `user` group by col, textcol1 order by col asc, textcol1 asc", - "Table": "`user`" + "Query": "select col, min(textcol1), max(textcol2), textcol1, textcol1, weight_string(max(textcol2)) from `user` group by col, textcol1 order by col asc, textcol1 asc" } ] }, @@ -5335,8 +5133,7 @@ }, "FieldQuery": "select col, col, count(*) from `user` where 1 != 1 group by col", "OrderBy": "0 ASC", - "Query": "select col, col, count(*) from `user` group by col order by col asc", - "Table": "`user`" + "Query": "select col, col, count(*) from `user` group by col order by col asc" } ] }, @@ -5369,7 +5166,6 @@ "OperatorType": "Join", "Variant": "Join", "JoinColumnIndexes": "L:0,R:0,R:1", - "TableName": "user_extra_`user`_`user`", "Inputs": [ { "OperatorType": "Route", @@ -5379,8 +5175,7 @@ "Sharded": true }, "FieldQuery": "select count(*) from user_extra as ue where 1 != 1", - "Query": "select count(*) from user_extra as ue", - "Table": "user_extra" + "Query": "select count(*) from user_extra as ue" }, { "OperatorType": "Projection", @@ -5393,7 +5188,6 @@ "OperatorType": "Join", "Variant": "Join", "JoinColumnIndexes": "L:0,R:0,L:1", - "TableName": "`user`_`user`", "Inputs": [ { "OperatorType": "Route", @@ -5403,8 +5197,7 @@ "Sharded": true }, "FieldQuery": "select count(*), count(u.col) from `user` as u where 1 != 1 group by .0", - "Query": "select count(*), count(u.col) from `user` as u group by .0", - "Table": "`user`" + "Query": "select count(*), count(u.col) from `user` as u group by .0" }, { "OperatorType": "Route", @@ -5414,8 +5207,7 @@ "Sharded": true }, "FieldQuery": "select count(*) from `user` as u2 where 1 != 1 group by .0", - "Query": "select count(*) from `user` as u2 group by .0", - "Table": "`user`" + "Query": "select count(*) from `user` as u2 group by .0" } ] } @@ -5454,7 +5246,6 @@ "JoinVars": { "user_col": 0 }, - "TableName": "`user`_user_extra", "Inputs": [ { "OperatorType": "Route", @@ -5465,8 +5256,7 @@ }, "FieldQuery": "select `user`.col, `user`.bar, weight_string(`user`.bar) from `user` where 1 != 1 group by `user`.col, `user`.bar, weight_string(`user`.bar)", "OrderBy": "0 ASC, (1|2) ASC", - "Query": "select `user`.col, `user`.bar, weight_string(`user`.bar) from `user` group by `user`.col, `user`.bar, weight_string(`user`.bar) order by `user`.col asc, `user`.bar asc", - "Table": "`user`" + "Query": "select `user`.col, `user`.bar, weight_string(`user`.bar) from `user` group by `user`.col, `user`.bar, weight_string(`user`.bar) order by `user`.col asc, `user`.bar asc" }, { "OperatorType": "Route", @@ -5476,8 +5266,7 @@ "Sharded": true }, "FieldQuery": "select min(user_extra.foo), max(user_extra.bar), weight_string(user_extra.foo), weight_string(user_extra.bar) from user_extra where 1 != 1 group by .0, weight_string(user_extra.foo), weight_string(user_extra.bar)", - "Query": "select min(user_extra.foo), max(user_extra.bar), weight_string(user_extra.foo), weight_string(user_extra.bar) from user_extra where user_extra.bar = :user_col /* INT16 */ group by .0, weight_string(user_extra.foo), weight_string(user_extra.bar)", - "Table": "user_extra" + "Query": "select min(user_extra.foo), max(user_extra.bar), weight_string(user_extra.foo), weight_string(user_extra.bar) from user_extra where user_extra.bar = :user_col /* INT16 */ group by .0, weight_string(user_extra.foo), weight_string(user_extra.bar)" } ] } @@ -5509,7 +5298,6 @@ "JoinVars": { "u_foo": 0 }, - "TableName": "`user`_user_extra", "Inputs": [ { "OperatorType": "Route", @@ -5519,8 +5307,7 @@ "Sharded": true }, "FieldQuery": "select u.foo from `user` as u where 1 != 1", - "Query": "select u.foo from `user` as u", - "Table": "`user`" + "Query": "select u.foo from `user` as u" }, { "OperatorType": "Route", @@ -5530,8 +5317,7 @@ "Sharded": true }, "FieldQuery": "select :u_foo * ue.bar, weight_string(:u_foo * ue.bar) from user_extra as ue where 1 != 1", - "Query": "select :u_foo * ue.bar, weight_string(:u_foo * ue.bar) from user_extra as ue", - "Table": "user_extra" + "Query": "select :u_foo * ue.bar, weight_string(:u_foo * ue.bar) from user_extra as ue" } ] } @@ -5562,7 +5348,6 @@ "JoinVars": { "user_foo": 0 }, - "TableName": "`user`_user_extra", "Inputs": [ { "OperatorType": "Route", @@ -5572,8 +5357,7 @@ "Sharded": true }, "FieldQuery": "select `user`.foo from `user` where 1 != 1", - "Query": "select `user`.foo from `user`", - "Table": "`user`" + "Query": "select `user`.foo from `user`" }, { "OperatorType": "Route", @@ -5583,8 +5367,7 @@ "Sharded": true }, "FieldQuery": "select :user_foo + user_extra.bar from user_extra where 1 != 1", - "Query": "select :user_foo + user_extra.bar from user_extra", - "Table": "user_extra" + "Query": "select :user_foo + user_extra.bar from user_extra" } ] } @@ -5630,7 +5413,6 @@ "JoinVars": { "user_id": 1 }, - "TableName": "`user`_user_extra", "Inputs": [ { "OperatorType": "Route", @@ -5640,8 +5422,7 @@ "Sharded": true }, "FieldQuery": "select count(*), `user`.id from `user` where 1 != 1 group by `user`.id", - "Query": "select count(*), `user`.id from `user` group by `user`.id", - "Table": "`user`" + "Query": "select count(*), `user`.id from `user` group by `user`.id" }, { "OperatorType": "Route", @@ -5651,8 +5432,7 @@ "Sharded": true }, "FieldQuery": "select count(*), :user_id + user_extra.id, weight_string(:user_id + user_extra.id) from user_extra where 1 != 1 group by :user_id + user_extra.id, weight_string(:user_id + user_extra.id)", - "Query": "select count(*), :user_id + user_extra.id, weight_string(:user_id + user_extra.id) from user_extra group by :user_id + user_extra.id, weight_string(:user_id + user_extra.id)", - "Table": "user_extra" + "Query": "select count(*), :user_id + user_extra.id, weight_string(:user_id + user_extra.id) from user_extra group by :user_id + user_extra.id, weight_string(:user_id + user_extra.id)" } ] } @@ -5694,8 +5474,7 @@ "Sharded": true }, "FieldQuery": "select 1, count(*) from `user` where 1 != 1", - "Query": "select 1, count(*) from `user`", - "Table": "`user`" + "Query": "select 1, count(*) from `user`" } ] } @@ -5738,7 +5517,6 @@ "JoinVars": { "user_col": 2 }, - "TableName": "`user`_user_extra", "Inputs": [ { "OperatorType": "Route", @@ -5748,8 +5526,7 @@ "Sharded": true }, "FieldQuery": "select sum(`user`.foo), count(*), `user`.col from `user` where 1 != 1 group by `user`.col", - "Query": "select sum(`user`.foo), count(*), `user`.col from `user` group by `user`.col", - "Table": "`user`" + "Query": "select sum(`user`.foo), count(*), `user`.col from `user` group by `user`.col" }, { "OperatorType": "Route", @@ -5759,8 +5536,7 @@ "Sharded": true }, "FieldQuery": "select count(*), sum(user_extra.bar) from user_extra where 1 != 1 group by .0", - "Query": "select count(*), sum(user_extra.bar) from user_extra where user_extra.col = :user_col /* INT16 */ group by .0", - "Table": "user_extra" + "Query": "select count(*), sum(user_extra.bar) from user_extra where user_extra.col = :user_col /* INT16 */ group by .0" } ] } @@ -5792,7 +5568,6 @@ "OperatorType": "Join", "Variant": "Join", "JoinColumnIndexes": "L:0", - "TableName": "`user`_user_extra", "Inputs": [ { "OperatorType": "Route", @@ -5802,8 +5577,7 @@ "Sharded": true }, "FieldQuery": "select `user`.a from `user` where 1 != 1", - "Query": "select `user`.a from `user`", - "Table": "`user`" + "Query": "select `user`.a from `user`" }, { "OperatorType": "Route", @@ -5813,8 +5587,7 @@ "Sharded": true }, "FieldQuery": "select 1 from user_extra where 1 != 1", - "Query": "select 1 from user_extra", - "Table": "user_extra" + "Query": "select 1 from user_extra" } ] } @@ -5853,7 +5626,6 @@ "JoinVars": { "u_bar": 2 }, - "TableName": "`user`_user_extra", "Inputs": [ { "OperatorType": "Route", @@ -5863,8 +5635,7 @@ "Sharded": true }, "FieldQuery": "select count(*), any_value(u.`name`), u.bar from `user` as u where 1 != 1 group by u.bar", - "Query": "select count(*), any_value(u.`name`), u.bar from `user` as u group by u.bar", - "Table": "`user`" + "Query": "select count(*), any_value(u.`name`), u.bar from `user` as u group by u.bar" }, { "OperatorType": "Route", @@ -5874,8 +5645,7 @@ "Sharded": true }, "FieldQuery": "select count(*), any_value(ue.title) from user_extra as ue where 1 != 1 group by .0", - "Query": "select count(*), any_value(ue.title) from user_extra as ue where ue.foo = :u_bar group by .0", - "Table": "user_extra" + "Query": "select count(*), any_value(ue.title) from user_extra as ue where ue.foo = :u_bar group by .0" } ] } @@ -5908,7 +5678,6 @@ "JoinVars": { "d_id": 1 }, - "TableName": "`user`_music", "Inputs": [ { "OperatorType": "Aggregate", @@ -5933,8 +5702,7 @@ }, "FieldQuery": "select dt.c0 as id, dt.c1 as a, weight_string(dt.c0), weight_string(dt.c0) from (select id, count(*) as a from `user` where 1 != 1) as dt(c0, c1) where 1 != 1", "OrderBy": "1 ASC, (0|3) ASC", - "Query": "select dt.c0 as id, dt.c1 as a, weight_string(dt.c0), weight_string(dt.c0) from (select id, count(*) as a from `user` order by count(*) asc, id asc) as dt(c0, c1)", - "Table": "`user`" + "Query": "select dt.c0 as id, dt.c1 as a, weight_string(dt.c0), weight_string(dt.c0) from (select id, count(*) as a from `user` order by count(*) asc, id asc) as dt(c0, c1)" } ] } @@ -5951,7 +5719,6 @@ }, "FieldQuery": "select 1 from music where 1 != 1 group by .0", "Query": "select 1 from music where music.user_id = :d_id group by .0", - "Table": "music", "Values": [ ":d_id" ], @@ -5993,7 +5760,6 @@ "JoinVars": { "music_foo": 0 }, - "TableName": "music_`user`", "Inputs": [ { "OperatorType": "Route", @@ -6003,8 +5769,7 @@ "Sharded": true }, "FieldQuery": "select music.foo from music where 1 != 1", - "Query": "select music.foo from music", - "Table": "music" + "Query": "select music.foo from music" }, { "OperatorType": "Route", @@ -6015,7 +5780,6 @@ }, "FieldQuery": "select `user`.id, `user`.bar, weight_string(`user`.bar) from `user` where 1 != 1", "Query": "select `user`.id, `user`.bar, weight_string(`user`.bar) from `user` where `user`.id = :music_foo", - "Table": "`user`", "Values": [ ":music_foo" ], @@ -6055,8 +5819,7 @@ }, "FieldQuery": "select intcol, group_concat(foo) from `user` where 1 != 1 group by intcol", "OrderBy": "0 ASC", - "Query": "select intcol, group_concat(foo) from `user` group by intcol order by intcol asc", - "Table": "`user`" + "Query": "select intcol, group_concat(foo) from `user` group by intcol order by intcol asc" } ] }, @@ -6091,7 +5854,6 @@ "JoinVars": { "u_col": 3 }, - "TableName": "`user`_music", "Inputs": [ { "OperatorType": "Route", @@ -6102,8 +5864,7 @@ }, "FieldQuery": "select u.foo, u.bar, u.baz, u.col, weight_string(u.foo), weight_string(u.baz) from `user` as u where 1 != 1", "OrderBy": "(0|4) ASC", - "Query": "select u.foo, u.bar, u.baz, u.col, weight_string(u.foo), weight_string(u.baz) from `user` as u order by u.foo asc", - "Table": "`user`" + "Query": "select u.foo, u.bar, u.baz, u.col, weight_string(u.foo), weight_string(u.baz) from `user` as u order by u.foo asc" }, { "OperatorType": "Route", @@ -6113,8 +5874,7 @@ "Sharded": true }, "FieldQuery": "select 1 from music as m where 1 != 1", - "Query": "select 1 from music as m where m.col = :u_col /* INT16 */", - "Table": "music" + "Query": "select 1 from music as m where m.col = :u_col /* INT16 */" } ] } @@ -6146,7 +5906,6 @@ "OperatorType": "Join", "Variant": "Join", "JoinColumnIndexes": "L:0,R:0,R:1,L:1", - "TableName": "`user`_music", "Inputs": [ { "OperatorType": "Route", @@ -6157,8 +5916,7 @@ }, "FieldQuery": "select u.col1, weight_string(u.col1) from `user` as u where 1 != 1 group by u.col1, weight_string(u.col1)", "OrderBy": "(0|1) ASC", - "Query": "select u.col1, weight_string(u.col1) from `user` as u group by u.col1, weight_string(u.col1) order by u.col1 asc", - "Table": "`user`" + "Query": "select u.col1, weight_string(u.col1) from `user` as u group by u.col1, weight_string(u.col1) order by u.col1 asc" }, { "OperatorType": "Route", @@ -6168,8 +5926,7 @@ "Sharded": true }, "FieldQuery": "select count(distinct m.user_id), sum(distinct m.user_id) from music as m where 1 != 1 group by .0", - "Query": "select count(distinct m.user_id), sum(distinct m.user_id) from music as m group by .0", - "Table": "music" + "Query": "select count(distinct m.user_id), sum(distinct m.user_id) from music as m group by .0" } ] } @@ -6204,8 +5961,7 @@ }, "FieldQuery": "select foo, min(bar) as `min(distinct bar)`, baz, baz, max(toto) as `max(distinct toto)`, weight_string(foo), weight_string(min(bar)), weight_string(baz), weight_string(max(toto)) from `user` where 1 != 1 group by foo, baz, weight_string(foo), weight_string(baz)", "OrderBy": "(0|5) ASC, (2|7) ASC", - "Query": "select foo, min(bar) as `min(distinct bar)`, baz, baz, max(toto) as `max(distinct toto)`, weight_string(foo), weight_string(min(bar)), weight_string(baz), weight_string(max(toto)) from `user` group by foo, baz, weight_string(foo), weight_string(baz) order by foo asc, baz asc", - "Table": "`user`" + "Query": "select foo, min(bar) as `min(distinct bar)`, baz, baz, max(toto) as `max(distinct toto)`, weight_string(foo), weight_string(min(bar)), weight_string(baz), weight_string(max(toto)) from `user` group by foo, baz, weight_string(foo), weight_string(baz) order by foo asc, baz asc" } ] }, @@ -6237,8 +5993,7 @@ "Sharded": true }, "FieldQuery": "select col from `user` where 1 != 1", - "Query": "select col from `user`", - "Table": "`user`" + "Query": "select col from `user`" }, { "OperatorType": "Route", @@ -6248,8 +6003,7 @@ "Sharded": false }, "FieldQuery": "select col from unsharded where 1 != 1", - "Query": "select col from unsharded", - "Table": "unsharded" + "Query": "select col from unsharded" } ] } @@ -6289,8 +6043,7 @@ "Sharded": true }, "FieldQuery": "select x.id, x.val2 from (select id, val2 from `user` where 1 != 1) as x where 1 != 1", - "Query": "select x.id, x.val2 from (select id, val2 from `user` where val2 is null) as x limit 2", - "Table": "`user`" + "Query": "select x.id, x.val2 from (select id, val2 from `user` where val2 is null) as x limit 2" } ] } @@ -6330,8 +6083,7 @@ }, "FetchLastInsertID": true, "FieldQuery": "select count(*) from `user` where 1 != 1", - "Query": "select count(*) from `user`", - "Table": "`user`" + "Query": "select count(*) from `user`" } ] } @@ -6364,7 +6116,6 @@ "OperatorType": "Join", "Variant": "Join", "JoinColumnIndexes": "L:0,R:0", - "TableName": "`user`_`user`", "Inputs": [ { "OperatorType": "Route", @@ -6374,8 +6125,7 @@ "Sharded": true }, "FieldQuery": "select count(*) from `user` where 1 != 1", - "Query": "select count(*) from `user`", - "Table": "`user`" + "Query": "select count(*) from `user`" }, { "OperatorType": "Aggregate", @@ -6404,8 +6154,7 @@ "Sharded": true }, "FieldQuery": "select count(*), .0 from `user` where 1 != 1 group by .0", - "Query": "select count(*), .0 from `user` group by .0", - "Table": "`user`" + "Query": "select count(*), .0 from `user` group by .0" } ] } @@ -6452,8 +6201,7 @@ "Sharded": true }, "FieldQuery": "select count(*) from user_extra where 1 != 1", - "Query": "select count(*) from user_extra", - "Table": "user_extra" + "Query": "select count(*) from user_extra" } ] }, @@ -6479,8 +6227,7 @@ "Sharded": true }, "FieldQuery": "select count(*) from `user` where 1 != 1", - "Query": "select count(*) from `user`", - "Table": "`user`" + "Query": "select count(*) from `user`" } ] }, @@ -6493,8 +6240,7 @@ "Sharded": false }, "FieldQuery": "select :__sq1 /* INT64 */ + :__sq2 /* INT64 */ as `(select count(*) from ``user``) + (select count(*) from user_extra)` from dual where 1 != 1", - "Query": "select :__sq1 /* INT64 */ + :__sq2 /* INT64 */ as `(select count(*) from ``user``) + (select count(*) from user_extra)` from dual", - "Table": "dual" + "Query": "select :__sq1 /* INT64 */ + :__sq2 /* INT64 */ as `(select count(*) from ``user``) + (select count(*) from user_extra)` from dual" } ] } @@ -6533,8 +6279,7 @@ "Sharded": true }, "FieldQuery": "select sum(id), count(id) from `user` where 1 != 1", - "Query": "select sum(id), count(id) from `user`", - "Table": "`user`" + "Query": "select sum(id), count(id) from `user`" } ] } @@ -6581,8 +6326,7 @@ }, "FieldQuery": "select bar, sum(id), count(foo), count(id), weight_string(bar) from `user` where 1 != 1 group by bar, weight_string(bar)", "OrderBy": "(0|4) ASC", - "Query": "select bar, sum(id), count(foo), count(id), weight_string(bar) from `user` group by bar, weight_string(bar) order by bar asc", - "Table": "`user`" + "Query": "select bar, sum(id), count(foo), count(id), weight_string(bar) from `user` group by bar, weight_string(bar) order by bar asc" } ] } @@ -6631,8 +6375,7 @@ }, "FieldQuery": "select bar, sum(id), count(foo), count(id), weight_string(bar) from `user` where 1 != 1 group by bar, weight_string(bar)", "OrderBy": "(0|4) ASC", - "Query": "select bar, sum(id), count(foo), count(id), weight_string(bar) from `user` group by bar, weight_string(bar) order by bar asc", - "Table": "`user`" + "Query": "select bar, sum(id), count(foo), count(id), weight_string(bar) from `user` group by bar, weight_string(bar) order by bar asc" } ] } @@ -6672,8 +6415,7 @@ "Sharded": true }, "FieldQuery": "select sum(foo), sum(bar), count(foo), count(bar) from `user` where 1 != 1", - "Query": "select sum(foo), sum(bar), count(foo), count(bar) from `user`", - "Table": "`user`" + "Query": "select sum(foo), sum(bar), count(foo), count(bar) from `user`" } ] } @@ -6711,8 +6453,7 @@ "Sharded": true }, "FieldQuery": "select sum(foo), count(foo), count(foo) from `user` where 1 != 1", - "Query": "select sum(foo), count(foo), count(foo) from `user`", - "Table": "`user`" + "Query": "select sum(foo), count(foo), count(foo) from `user`" } ] } @@ -6737,7 +6478,6 @@ "JoinVars": { "tables_table_name": 0 }, - "TableName": "`user`_`user`", "Inputs": [ { "OperatorType": "Route", @@ -6748,7 +6488,6 @@ }, "FieldQuery": "select `tables`.`table_name` from (select `table_name` from `user` where 1 != 1 group by `table_name`) as `tables` where 1 != 1", "Query": "select `tables`.`table_name` from (select `table_name` from `user` where id = 143 group by `table_name`) as `tables`", - "Table": "`user`", "Values": [ "143" ], @@ -6762,8 +6501,7 @@ "Sharded": true }, "FieldQuery": "select c.`column_name` from `user` as c where 1 != 1", - "Query": "select c.`column_name` from `user` as c where c.`table_name` = :tables_table_name", - "Table": "`user`" + "Query": "select c.`column_name` from `user` as c where c.`table_name` = :tables_table_name" } ] }, @@ -6797,7 +6535,6 @@ "JoinVars": { "foobars_min_id": 0 }, - "TableName": "`user`_music", "Inputs": [ { "OperatorType": "Aggregate", @@ -6818,8 +6555,7 @@ }, "FieldQuery": "select min(bb.id) as min_id, max(bb.id) as max_id, weight_string(min(bb.id)), weight_string(max(bb.id)) from `user` as bb where 1 != 1", "OrderBy": "0 ASC COLLATE utf8mb4_0900_ai_ci", - "Query": "select min(bb.id) as min_id, max(bb.id) as max_id, weight_string(min(bb.id)), weight_string(max(bb.id)) from `user` as bb order by min(bb.id) asc", - "Table": "`user`" + "Query": "select min(bb.id) as min_id, max(bb.id) as max_id, weight_string(min(bb.id)), weight_string(max(bb.id)) from `user` as bb order by min(bb.id) asc" } ] } @@ -6833,8 +6569,7 @@ "Sharded": true }, "FieldQuery": "select b.col, weight_string(b.col) from music as b where 1 != 1 group by b.col, weight_string(b.col)", - "Query": "select b.col, weight_string(b.col) from music as b where b.id > :foobars_min_id group by b.col, weight_string(b.col)", - "Table": "music" + "Query": "select b.col, weight_string(b.col) from music as b where b.id > :foobars_min_id group by b.col, weight_string(b.col)" } ] } @@ -6881,7 +6616,6 @@ "OperatorType": "Join", "Variant": "Join", "JoinColumnIndexes": "L:0,R:0,L:1,R:1,L:2,R:2", - "TableName": "`user`_music", "Inputs": [ { "OperatorType": "Route", @@ -6891,8 +6625,7 @@ "Sharded": true }, "FieldQuery": "select count(*), cast(`user`.foo as datetime) as f1, weight_string(cast(`user`.foo as datetime)) from `user` where 1 != 1 group by cast(`user`.foo as datetime), weight_string(cast(`user`.foo as datetime))", - "Query": "select count(*), cast(`user`.foo as datetime) as f1, weight_string(cast(`user`.foo as datetime)) from `user` group by cast(`user`.foo as datetime), weight_string(cast(`user`.foo as datetime))", - "Table": "`user`" + "Query": "select count(*), cast(`user`.foo as datetime) as f1, weight_string(cast(`user`.foo as datetime)) from `user` group by cast(`user`.foo as datetime), weight_string(cast(`user`.foo as datetime))" }, { "OperatorType": "Route", @@ -6902,8 +6635,7 @@ "Sharded": true }, "FieldQuery": "select count(*), cast(music.foo as datetime) as f2, weight_string(cast(music.foo as datetime)) from music where 1 != 1 group by cast(music.foo as datetime), weight_string(cast(music.foo as datetime))", - "Query": "select count(*), cast(music.foo as datetime) as f2, weight_string(cast(music.foo as datetime)) from music group by cast(music.foo as datetime), weight_string(cast(music.foo as datetime))", - "Table": "music" + "Query": "select count(*), cast(music.foo as datetime) as f2, weight_string(cast(music.foo as datetime)) from music group by cast(music.foo as datetime), weight_string(cast(music.foo as datetime))" } ] } @@ -6955,7 +6687,6 @@ "ComparisonType": "INT16", "JoinColumnIndexes": "-1,1,-2,2,-3,3,-3,4", "Predicate": "`user`.col = ue.col", - "TableName": "`user`_user_extra", "Inputs": [ { "OperatorType": "Route", @@ -6965,8 +6696,7 @@ "Sharded": true }, "FieldQuery": "select count(*), `user`.col, `user`.foo from `user` where 1 != 1 group by `user`.col, `user`.foo", - "Query": "select count(*), `user`.col, `user`.foo from `user` group by `user`.col, `user`.foo", - "Table": "`user`" + "Query": "select count(*), `user`.col, `user`.foo from `user` group by `user`.col, `user`.foo" }, { "OperatorType": "Aggregate", @@ -7000,8 +6730,7 @@ "Sharded": true }, "FieldQuery": "select ue.col, ue.bar, weight_string(ue.bar) from (select col, bar from user_extra where 1 != 1) as ue where 1 != 1", - "Query": "select ue.col, ue.bar, weight_string(ue.bar) from (select col, bar from user_extra) as ue limit 10", - "Table": "user_extra" + "Query": "select ue.col, ue.bar, weight_string(ue.bar) from (select col, bar from user_extra) as ue limit 10" } ] } @@ -7041,7 +6770,6 @@ }, "FieldQuery": "select max((select min(col) from `user` where 1 != 1)) from dual where 1 != 1", "Query": "select max((select min(col) from `user` where id = 1)) from dual", - "Table": "dual", "Values": [ "1" ], @@ -7082,8 +6810,7 @@ "Sharded": false }, "FieldQuery": "select min(col) from unsharded where 1 != 1", - "Query": "select min(col) from unsharded", - "Table": "unsharded" + "Query": "select min(col) from unsharded" }, { "InputName": "Outer", @@ -7095,7 +6822,6 @@ }, "FieldQuery": "select max(:__sq1), weight_string(:__sq1) from `user` where 1 != 1 group by weight_string(:__sq1)", "Query": "select max(:__sq1), weight_string(:__sq1) from `user` where id = 1 group by weight_string(:__sq1)", - "Table": "`user`", "Values": [ "1" ], @@ -7141,7 +6867,6 @@ }, "FieldQuery": "select min(col) from `user` where 1 != 1", "Query": "select min(col) from `user` where id = 1", - "Table": "`user`", "Values": [ "1" ], @@ -7157,7 +6882,6 @@ }, "FieldQuery": "select max(:__sq1 /* INT16 */), weight_string(:__sq1 /* INT16 */) from `user` where 1 != 1 group by weight_string(:__sq1 /* INT16 */)", "Query": "select max(:__sq1 /* INT16 */), weight_string(:__sq1 /* INT16 */) from `user` where id = 2 group by weight_string(:__sq1 /* INT16 */)", - "Table": "`user`", "Values": [ "2" ], @@ -7188,7 +6912,6 @@ }, "FieldQuery": "select max((select group_concat(col1, col2) from `user` where 1 != 1)) from dual where 1 != 1", "Query": "select max((select group_concat(col1, col2) from `user` where id = 1)) from dual", - "Table": "dual", "Values": [ "1" ], @@ -7216,7 +6939,6 @@ }, "FieldQuery": "select max((select group_concat(col1, col2) from `user` where 1 != 1)) from `user` where 1 != 1", "Query": "select max((select group_concat(col1, col2) from `user` where id = 1)) from `user` where id = 1", - "Table": "`user`", "Values": [ "1" ], @@ -7257,7 +6979,6 @@ }, "FieldQuery": "select group_concat(col1, col2) from `user` where 1 != 1", "Query": "select group_concat(col1, col2) from `user` where id = 1", - "Table": "`user`", "Values": [ "1" ], @@ -7272,8 +6993,7 @@ "Sharded": true }, "FieldQuery": "select max(:__sq1), weight_string(:__sq1) from `user` where 1 != 1 group by weight_string(:__sq1)", - "Query": "select max(:__sq1), weight_string(:__sq1) from `user` group by weight_string(:__sq1)", - "Table": "`user`" + "Query": "select max(:__sq1), weight_string(:__sq1) from `user` group by weight_string(:__sq1)" } ] } @@ -7305,8 +7025,7 @@ "Sharded": true }, "FieldQuery": "select max((select max(col2) from `user` as u1 where 1 != 1)), weight_string(max((select max(col2) from `user` as u1 where 1 != 1))) from `user` as u2 where 1 != 1", - "Query": "select max((select max(col2) from `user` as u1 where u1.id = u2.id)), weight_string(max((select max(col2) from `user` as u1 where u1.id = u2.id))) from `user` as u2", - "Table": "`user`" + "Query": "select max((select max(col2) from `user` as u1 where u1.id = u2.id)), weight_string(max((select max(col2) from `user` as u1 where u1.id = u2.id))) from `user` as u2" } ] }, @@ -7335,8 +7054,7 @@ "Sharded": true }, "FieldQuery": "select count(a, b) from `user` where 1 != 1", - "Query": "select count(a, b) from `user`", - "Table": "`user`" + "Query": "select count(a, b) from `user`" } ] }, @@ -7365,8 +7083,7 @@ "Sharded": true }, "FieldQuery": "select group_concat(col1, col2) from `user` where 1 != 1", - "Query": "select group_concat(col1, col2) from `user`", - "Table": "`user`" + "Query": "select group_concat(col1, col2) from `user`" } ] }, @@ -7395,8 +7112,7 @@ "Sharded": true }, "FieldQuery": "select count(distinct `name`, id) from `user` where 1 != 1", - "Query": "select count(distinct `name`, id) from `user`", - "Table": "`user`" + "Query": "select count(distinct `name`, id) from `user`" } ] }, @@ -7422,8 +7138,7 @@ "FieldQuery": "select id, from_unixtime(min(col)) as col, min(col) from `user` where 1 != 1 group by id", "OrderBy": "2 ASC COLLATE utf8mb4_0900_ai_ci", "Query": "select id, from_unixtime(min(col)) as col, min(col) from `user` group by id order by min(col) asc", - "ResultColumns": 2, - "Table": "`user`" + "ResultColumns": 2 }, "TablesUsed": [ "user.user" @@ -7454,8 +7169,7 @@ "Sharded": true }, "FieldQuery": "select sum(x) as col from `user` where 1 != 1", - "Query": "select sum(x) as col from `user` where x > 0", - "Table": "`user`" + "Query": "select sum(x) as col from `user` where x > 0" } ] } @@ -7491,8 +7205,7 @@ "Sharded": true }, "FieldQuery": "select id from `user` where 1 != 1 group by id", - "Query": "select id from `user` group by id having udf_aggr(foo) > 1", - "Table": "`user`" + "Query": "select id from `user` group by id having udf_aggr(foo) > 1" }, "TablesUsed": [ "user.user" @@ -7514,8 +7227,7 @@ "Sharded": false }, "FieldQuery": "select bar, udf_aggr(foo) from unsharded where 1 != 1 group by bar", - "Query": "select bar, udf_aggr(foo) from unsharded group by bar", - "Table": "unsharded" + "Query": "select bar, udf_aggr(foo) from unsharded group by bar" }, "TablesUsed": [ "main.unsharded" @@ -7538,7 +7250,6 @@ }, "FieldQuery": "select bar, udf_aggr(foo) from `user` where 1 != 1 group by bar", "Query": "select bar, udf_aggr(foo) from `user` where id = 17 group by bar", - "Table": "`user`", "Values": [ "17" ], @@ -7581,8 +7292,7 @@ }, "FieldQuery": "select subquery_for_count.one, subquery_for_count.id, weight_string(subquery_for_count.id) from (select 1 as one, id from `user` where 1 != 1) as subquery_for_count where 1 != 1", "OrderBy": "(1|2) DESC", - "Query": "select subquery_for_count.one, subquery_for_count.id, weight_string(subquery_for_count.id) from (select 1 as one, id from `user` where `user`.is_not_deleted = true) as subquery_for_count order by subquery_for_count.id desc limit 25", - "Table": "`user`" + "Query": "select subquery_for_count.one, subquery_for_count.id, weight_string(subquery_for_count.id) from (select 1 as one, id from `user` where `user`.is_not_deleted = true) as subquery_for_count order by subquery_for_count.id desc limit 25" } ] } @@ -7629,7 +7339,6 @@ "JoinVars": { "user_team_id": 1 }, - "TableName": "`user`_user_extra", "Inputs": [ { "OperatorType": "Route", @@ -7639,8 +7348,7 @@ "Sharded": true }, "FieldQuery": "select sum(`user`.type), `user`.team_id from `user` where 1 != 1 group by `user`.team_id", - "Query": "select sum(`user`.type), `user`.team_id from `user` group by `user`.team_id", - "Table": "`user`" + "Query": "select sum(`user`.type), `user`.team_id from `user` group by `user`.team_id" }, { "OperatorType": "Route", @@ -7650,8 +7358,7 @@ "Sharded": true }, "FieldQuery": "select count(*), user_extra.id, weight_string(user_extra.id) from user_extra where 1 != 1 group by user_extra.id, weight_string(user_extra.id)", - "Query": "select count(*), user_extra.id, weight_string(user_extra.id) from user_extra where user_extra.id = :user_team_id group by user_extra.id, weight_string(user_extra.id)", - "Table": "user_extra" + "Query": "select count(*), user_extra.id, weight_string(user_extra.id) from user_extra where user_extra.id = :user_team_id group by user_extra.id, weight_string(user_extra.id)" } ] } diff --git a/go/vt/vtgate/planbuilder/testdata/cte_cases.json b/go/vt/vtgate/planbuilder/testdata/cte_cases.json index 54ec6714849..7d02e4c401a 100644 --- a/go/vt/vtgate/planbuilder/testdata/cte_cases.json +++ b/go/vt/vtgate/planbuilder/testdata/cte_cases.json @@ -19,8 +19,7 @@ "Sharded": true }, "FieldQuery": "select count(*) as a from `user` where 1 != 1", - "Query": "select count(*) as a from `user`", - "Table": "`user`" + "Query": "select count(*) as a from `user`" } ] }, @@ -49,8 +48,7 @@ "Sharded": true }, "FieldQuery": "select count(*) from (select `user`.col, user_extra.extra from `user`, user_extra where 1 != 1) as a where 1 != 1", - "Query": "select count(*) from (select `user`.col, user_extra.extra from `user`, user_extra where `user`.id = user_extra.user_id) as a", - "Table": "`user`, user_extra" + "Query": "select count(*) from (select `user`.col, user_extra.extra from `user`, user_extra where `user`.id = user_extra.user_id) as a" } ] }, @@ -75,8 +73,7 @@ "Sharded": true }, "FieldQuery": "select col from (select `user`.col, user_extra.extra from `user`, user_extra where 1 != 1) as a where 1 != 1", - "Query": "select col from (select `user`.col, user_extra.extra from `user`, user_extra where `user`.id = user_extra.user_id) as a", - "Table": "`user`, user_extra" + "Query": "select col from (select `user`.col, user_extra.extra from `user`, user_extra where `user`.id = user_extra.user_id) as a" }, "TablesUsed": [ "user.user", @@ -106,8 +103,7 @@ }, "FieldQuery": "select col, count(*) from (select `user`.col, user_extra.extra from `user`, user_extra where 1 != 1) as a where 1 != 1 group by col", "OrderBy": "0 ASC", - "Query": "select col, count(*) from (select `user`.col, user_extra.extra from `user`, user_extra where `user`.id = user_extra.user_id) as a group by col order by col asc", - "Table": "`user`, user_extra" + "Query": "select col, count(*) from (select `user`.col, user_extra.extra from `user`, user_extra where `user`.id = user_extra.user_id) as a group by col order by col asc" } ] }, @@ -139,7 +135,6 @@ "OperatorType": "Join", "Variant": "Join", "JoinColumnIndexes": "L:0,R:0", - "TableName": "`user`_user_extra", "Inputs": [ { "OperatorType": "Route", @@ -149,8 +144,7 @@ "Sharded": true }, "FieldQuery": "select sum(col) from (select `user`.col as col, 32 from `user` where 1 != 1) as t where 1 != 1", - "Query": "select sum(col) from (select `user`.col as col, 32 from `user`) as t", - "Table": "`user`" + "Query": "select sum(col) from (select `user`.col as col, 32 from `user`) as t" }, { "OperatorType": "Route", @@ -160,8 +154,7 @@ "Sharded": true }, "FieldQuery": "select count(*) from user_extra where 1 != 1 group by .0", - "Query": "select count(*) from user_extra group by .0", - "Table": "user_extra" + "Query": "select count(*) from user_extra group by .0" } ] } @@ -203,8 +196,7 @@ "Sharded": true }, "FieldQuery": "select x.phone, x.id, x.city from (select phone, id, city from `user` where 1 != 1) as x where 1 != 1", - "Query": "select x.phone, x.id, x.city from (select phone, id, city from `user` where id > 12) as x limit 10", - "Table": "`user`" + "Query": "select x.phone, x.id, x.city from (select phone, id, city from `user` where id > 12) as x limit 10" } ] } @@ -247,8 +239,7 @@ "Sharded": true }, "FieldQuery": "select 1 from (select phone, id, city from `user` where 1 != 1) as x where 1 != 1", - "Query": "select 1 from (select phone, id, city from `user` where id > 12) as x limit 10", - "Table": "`user`" + "Query": "select 1 from (select phone, id, city from `user` where id > 12) as x limit 10" } ] } @@ -284,7 +275,6 @@ "JoinVars": { "user_id": 0 }, - "TableName": "`user`_user_extra", "Inputs": [ { "OperatorType": "Limit", @@ -298,8 +288,7 @@ "Sharded": true }, "FieldQuery": "select x.`user.id` from (select `user`.id as `user.id` from `user` where 1 != 1) as x where 1 != 1", - "Query": "select x.`user.id` from (select `user`.id as `user.id` from `user`) as x limit 10", - "Table": "`user`" + "Query": "select x.`user.id` from (select `user`.id as `user.id` from `user`) as x limit 10" } ] }, @@ -315,8 +304,7 @@ "Sharded": true }, "FieldQuery": "select x.col from (select user_extra.col as col from user_extra where 1 != 1) as x where 1 != 1", - "Query": "select x.col from (select user_extra.col as col from user_extra where user_extra.id = :user_id) as x limit 10", - "Table": "user_extra" + "Query": "select x.col from (select user_extra.col as col from user_extra where user_extra.id = :user_id) as x limit 10" } ] } @@ -367,8 +355,7 @@ }, "FieldQuery": "select x.id, x.val1, weight_string(x.val1) from (select id, val1 from `user` where 1 != 1) as x where 1 != 1", "OrderBy": "(1|2) ASC", - "Query": "select x.id, x.val1, weight_string(x.val1) from (select id, val1 from `user` where val2 < 4) as x order by x.val1 asc limit 2", - "Table": "`user`" + "Query": "select x.id, x.val1, weight_string(x.val1) from (select id, val1 from `user` where val2 < 4) as x order by x.val1 asc limit 2" } ] } @@ -419,8 +406,7 @@ "Sharded": true }, "FieldQuery": "select id, count(*), 1 from `user` where 1 != 1", - "Query": "select id, count(*), 1 from `user`", - "Table": "`user`" + "Query": "select id, count(*), 1 from `user`" } ] } @@ -463,8 +449,7 @@ "Sharded": true }, "FieldQuery": "select sum(a) as a, sum(b) as b from `user` where 1 != 1", - "Query": "select sum(a) as a, sum(b) as b from `user`", - "Table": "`user`" + "Query": "select sum(a) as a, sum(b) as b from `user`" } ] } @@ -490,8 +475,7 @@ "Sharded": true }, "FieldQuery": "select t1.portalId, t1.flowId from (select portalId, flowId, count(*) as `count` from user_extra where 1 != 1 group by user_id, flowId) as t1 where 1 != 1", - "Query": "select t1.portalId, t1.flowId from (select portalId, flowId, count(*) as `count` from user_extra where localDate > :v1 group by user_id, flowId) as t1 where `count` >= :v2", - "Table": "user_extra" + "Query": "select t1.portalId, t1.flowId from (select portalId, flowId, count(*) as `count` from user_extra where localDate > :v1 group by user_id, flowId) as t1 where `count` >= :v2" }, "TablesUsed": [ "user.user_extra" @@ -525,8 +509,7 @@ }, "FieldQuery": "select foo, max(baz) as bazo, weight_string(foo), weight_string(max(baz)) from (select foo, baz from `user` where 1 != 1) as f where 1 != 1 group by foo, weight_string(foo)", "OrderBy": "(0|2) ASC", - "Query": "select foo, max(baz) as bazo, weight_string(foo), weight_string(max(baz)) from (select foo, baz from `user`) as f group by foo, weight_string(foo) order by foo asc", - "Table": "`user`" + "Query": "select foo, max(baz) as bazo, weight_string(foo), weight_string(max(baz)) from (select foo, baz from `user`) as f group by foo, weight_string(foo) order by foo asc" } ] } @@ -564,8 +547,7 @@ }, "FieldQuery": "select foo, count(baz) as bazo, weight_string(foo) from (select foo, baz from `user` where 1 != 1) as f where 1 != 1 group by foo, weight_string(foo)", "OrderBy": "(0|2) ASC", - "Query": "select foo, count(baz) as bazo, weight_string(foo) from (select foo, baz from `user`) as f group by foo, weight_string(foo) order by foo asc", - "Table": "`user`" + "Query": "select foo, count(baz) as bazo, weight_string(foo) from (select foo, baz from `user`) as f group by foo, weight_string(foo) order by foo asc" } ] } @@ -595,7 +577,6 @@ "JoinVars": { "d_id": 1 }, - "TableName": "`user`_music", "Inputs": [ { "OperatorType": "Aggregate", @@ -620,8 +601,7 @@ }, "FieldQuery": "select dt.c0 as id, dt.c1 as a, weight_string(dt.c0), weight_string(dt.c0) from (select id, count(*) as a from `user` where 1 != 1) as dt(c0, c1) where 1 != 1", "OrderBy": "1 ASC, (0|3) ASC", - "Query": "select dt.c0 as id, dt.c1 as a, weight_string(dt.c0), weight_string(dt.c0) from (select id, count(*) as a from `user` order by count(*) asc, id asc) as dt(c0, c1)", - "Table": "`user`" + "Query": "select dt.c0 as id, dt.c1 as a, weight_string(dt.c0), weight_string(dt.c0) from (select id, count(*) as a from `user` order by count(*) asc, id asc) as dt(c0, c1)" } ] } @@ -638,7 +618,6 @@ }, "FieldQuery": "select 1 from music where 1 != 1 group by .0", "Query": "select 1 from music where music.user_id = :d_id group by .0", - "Table": "music", "Values": [ ":d_id" ], @@ -677,8 +656,7 @@ "Sharded": true }, "FieldQuery": "select col from `user` where 1 != 1", - "Query": "select col from `user`", - "Table": "`user`" + "Query": "select col from `user`" }, { "OperatorType": "Route", @@ -688,8 +666,7 @@ "Sharded": false }, "FieldQuery": "select col from unsharded where 1 != 1", - "Query": "select col from unsharded", - "Table": "unsharded" + "Query": "select col from unsharded" } ] } @@ -729,8 +706,7 @@ "Sharded": true }, "FieldQuery": "select x.id, x.val2 from (select id, val2 from `user` where 1 != 1) as x where 1 != 1", - "Query": "select x.id, x.val2 from (select id, val2 from `user` where val2 is null) as x limit 2", - "Table": "`user`" + "Query": "select x.id, x.val2 from (select id, val2 from `user` where val2 is null) as x limit 2" } ] } @@ -774,8 +750,7 @@ "Sharded": true }, "FieldQuery": "select count(*) from `user` where 1 != 1", - "Query": "select count(*) from `user`", - "Table": "`user`" + "Query": "select count(*) from `user`" } ] } @@ -804,7 +779,6 @@ }, "FieldQuery": "select id from (select id, col from `user` where 1 != 1) as t where 1 != 1", "Query": "select id from (select id, col from `user` where id = 5) as t", - "Table": "`user`", "Values": [ "5" ], @@ -831,7 +805,6 @@ }, "FieldQuery": "select t.id from (select id from `user` where 1 != 1) as t, user_extra where 1 != 1", "Query": "select t.id from (select id from `user` where id = 5) as t, user_extra where t.id = user_extra.user_id", - "Table": "`user`, user_extra", "Values": [ "5" ], @@ -859,7 +832,6 @@ }, "FieldQuery": "select t.id from (select `user`.id from `user` where 1 != 1) as t, user_extra where 1 != 1", "Query": "select t.id from (select `user`.id from `user` where `user`.id = 5) as t, user_extra where t.id = user_extra.user_id", - "Table": "`user`, user_extra", "Values": [ "5" ], @@ -887,7 +859,6 @@ }, "FieldQuery": "select t.id from (select id from `user` where 1 != 1) as t, user_extra where 1 != 1", "Query": "select t.id from (select id from `user` where id = 5) as t, user_extra where t.id = user_extra.user_id", - "Table": "`user`, user_extra", "Values": [ "5" ], @@ -913,7 +884,6 @@ "JoinVars": { "t_id": 0 }, - "TableName": "`user`_user_extra", "Inputs": [ { "OperatorType": "Route", @@ -924,7 +894,6 @@ }, "FieldQuery": "select t.id from (select id from `user` where 1 != 1) as t where 1 != 1", "Query": "select t.id from (select id from `user` where id = 5) as t", - "Table": "`user`", "Values": [ "5" ], @@ -938,8 +907,7 @@ "Sharded": true }, "FieldQuery": "select 1 from user_extra where 1 != 1", - "Query": "select 1 from user_extra where user_extra.col = :t_id", - "Table": "user_extra" + "Query": "select 1 from user_extra where user_extra.col = :t_id" } ] }, @@ -965,7 +933,6 @@ }, "FieldQuery": "select id from (select id, col from `user` as route1 where 1 != 1) as t where 1 != 1", "Query": "select id from (select id, col from `user` as route1 where id = 5) as t", - "Table": "`user`", "Values": [ "5" ], @@ -992,7 +959,6 @@ }, "FieldQuery": "select id from (select id, col from `user` as route1 where 1 != 1) as t where 1 != 1", "Query": "select id from (select id, col from `user` as route1 where id = 5) as t", - "Table": "`user`", "Values": [ "5" ], @@ -1023,8 +989,7 @@ "Sharded": true }, "FieldQuery": "select t.id from (select id, textcol1 as baz from `user` as route1 where 1 != 1) as t, (select id, textcol1 + textcol1 as baz from `user` where 1 != 1) as s where 1 != 1", - "Query": "select t.id from (select id, textcol1 as baz from `user` as route1 where textcol1 = '3') as t, (select id, textcol1 + textcol1 as baz from `user` where textcol1 + textcol1 = '3') as s where t.id = s.id", - "Table": "`user`" + "Query": "select t.id from (select id, textcol1 as baz from `user` as route1 where textcol1 = '3') as t, (select id, textcol1 + textcol1 as baz from `user` where textcol1 + textcol1 = '3') as s where t.id = s.id" }, "TablesUsed": [ "user.user" @@ -1046,8 +1011,7 @@ "Sharded": true }, "FieldQuery": "select bar from (select foo + 4 as bar from (select colA + colB as foo from `user` where 1 != 1) as u where 1 != 1) as t where 1 != 1", - "Query": "select bar from (select foo + 4 as bar from (select colA + colB as foo from `user` where colA + colB + 4 = 5) as u) as t", - "Table": "`user`" + "Query": "select bar from (select foo + 4 as bar from (select colA + colB as foo from `user` where colA + colB + 4 = 5) as u) as t" }, "TablesUsed": [ "user.user" @@ -1070,7 +1034,6 @@ }, "FieldQuery": "select u.col, e.col from (select col from `user` where 1 != 1) as u, (select col from user_extra where 1 != 1) as e where 1 != 1", "Query": "select u.col, e.col from (select col from `user` where id = 5) as u, (select col from user_extra where user_id = 5) as e", - "Table": "`user`, user_extra", "Values": [ "5" ], @@ -1097,13 +1060,11 @@ "t_col1": 0, "t_id": 1 }, - "TableName": "`user`_user_extra_unsharded", "Inputs": [ { "OperatorType": "Join", "Variant": "Join", "JoinColumnIndexes": "L:1,L:0", - "TableName": "`user`_user_extra", "Inputs": [ { "OperatorType": "Route", @@ -1113,8 +1074,7 @@ "Sharded": true }, "FieldQuery": "select t.id, t.col1 from (select `user`.id, `user`.col1 from `user` where 1 != 1) as t where 1 != 1", - "Query": "select t.id, t.col1 from (select `user`.id, `user`.col1 from `user`) as t", - "Table": "`user`" + "Query": "select t.id, t.col1 from (select `user`.id, `user`.col1 from `user`) as t" }, { "OperatorType": "Route", @@ -1124,8 +1084,7 @@ "Sharded": true }, "FieldQuery": "select 1 from user_extra where 1 != 1", - "Query": "select 1 from user_extra", - "Table": "user_extra" + "Query": "select 1 from user_extra" } ] }, @@ -1137,8 +1096,7 @@ "Sharded": false }, "FieldQuery": "select 1 from unsharded where 1 != 1", - "Query": "select 1 from unsharded where unsharded.id = :t_id and unsharded.col1 = :t_col1", - "Table": "unsharded" + "Query": "select 1 from unsharded where unsharded.id = :t_id and unsharded.col1 = :t_col1" } ] }, @@ -1163,7 +1121,6 @@ "JoinVars": { "user_col": 2 }, - "TableName": "`user`_user_extra", "Inputs": [ { "OperatorType": "Route", @@ -1173,8 +1130,7 @@ "Sharded": true }, "FieldQuery": "select t.id, t.col1, t.`user.col` from (select `user`.id, `user`.col1, `user`.col as `user.col` from `user` where 1 != 1) as t where 1 != 1", - "Query": "select t.id, t.col1, t.`user.col` from (select `user`.id, `user`.col1, `user`.col as `user.col` from `user`) as t", - "Table": "`user`" + "Query": "select t.id, t.col1, t.`user.col` from (select `user`.id, `user`.col1, `user`.col as `user.col` from `user`) as t" }, { "OperatorType": "Route", @@ -1184,8 +1140,7 @@ "Sharded": true }, "FieldQuery": "select 1 from user_extra where 1 != 1", - "Query": "select 1 from user_extra where user_extra.col = :user_col /* INT16 */", - "Table": "user_extra" + "Query": "select 1 from user_extra where user_extra.col = :user_col /* INT16 */" } ] }, @@ -1206,7 +1161,6 @@ "OperatorType": "Join", "Variant": "Join", "JoinColumnIndexes": "R:0", - "TableName": "unsharded_a_`user`_user_extra", "Inputs": [ { "OperatorType": "Route", @@ -1216,14 +1170,12 @@ "Sharded": false }, "FieldQuery": "select 1 from unsharded_a as ua where 1 != 1", - "Query": "select 1 from unsharded_a as ua", - "Table": "unsharded_a" + "Query": "select 1 from unsharded_a as ua" }, { "OperatorType": "Join", "Variant": "Join", "JoinColumnIndexes": "L:1", - "TableName": "`user`_user_extra", "Inputs": [ { "OperatorType": "Route", @@ -1233,8 +1185,7 @@ "Sharded": true }, "FieldQuery": "select t.id, t.col1 from (select `user`.id, `user`.col1 from `user` where 1 != 1) as t where 1 != 1", - "Query": "select t.id, t.col1 from (select `user`.id, `user`.col1 from `user`) as t", - "Table": "`user`" + "Query": "select t.id, t.col1 from (select `user`.id, `user`.col1 from `user`) as t" }, { "OperatorType": "Route", @@ -1244,8 +1195,7 @@ "Sharded": true }, "FieldQuery": "select 1 from user_extra where 1 != 1", - "Query": "select 1 from user_extra", - "Table": "user_extra" + "Query": "select 1 from user_extra" } ] } @@ -1272,7 +1222,6 @@ "JoinVars": { "ua_id": 0 }, - "TableName": "unsharded_a_`user`_user_extra", "Inputs": [ { "OperatorType": "Route", @@ -1282,14 +1231,12 @@ "Sharded": false }, "FieldQuery": "select ua.id from unsharded_a as ua where 1 != 1", - "Query": "select ua.id from unsharded_a as ua", - "Table": "unsharded_a" + "Query": "select ua.id from unsharded_a as ua" }, { "OperatorType": "Join", "Variant": "Join", "JoinColumnIndexes": "L:1", - "TableName": "`user`_user_extra", "Inputs": [ { "OperatorType": "Route", @@ -1300,7 +1247,6 @@ }, "FieldQuery": "select t.id, t.col1 from (select `user`.id, `user`.col1 from `user` where 1 != 1) as t where 1 != 1", "Query": "select t.id, t.col1 from (select `user`.id, `user`.col1 from `user` where `user`.id = :ua_id) as t", - "Table": "`user`", "Values": [ ":ua_id" ], @@ -1314,8 +1260,7 @@ "Sharded": true }, "FieldQuery": "select 1 from user_extra where 1 != 1", - "Query": "select 1 from user_extra", - "Table": "user_extra" + "Query": "select 1 from user_extra" } ] } @@ -1339,7 +1284,6 @@ "OperatorType": "Join", "Variant": "Join", "JoinColumnIndexes": "L:0,L:0", - "TableName": "`user`_user_extra", "Inputs": [ { "OperatorType": "Route", @@ -1349,8 +1293,7 @@ "Sharded": true }, "FieldQuery": "select t.id from (select `user`.id from `user` where 1 != 1) as t where 1 != 1", - "Query": "select t.id from (select `user`.id from `user`) as t", - "Table": "`user`" + "Query": "select t.id from (select `user`.id from `user`) as t" }, { "OperatorType": "Route", @@ -1360,8 +1303,7 @@ "Sharded": true }, "FieldQuery": "select 1 from user_extra where 1 != 1", - "Query": "select 1 from user_extra", - "Table": "user_extra" + "Query": "select 1 from user_extra" } ] }, @@ -1397,8 +1339,7 @@ "Sharded": true }, "FieldQuery": "select count(*) as a from `user` where 1 != 1", - "Query": "select count(*) as a from `user`", - "Table": "`user`" + "Query": "select count(*) as a from `user`" } ] } @@ -1424,8 +1365,7 @@ "Sharded": false }, "FieldQuery": "with u as (select * from unsharded where 1 != 1) select u.* from u where 1 != 1", - "Query": "with u as (select * from unsharded) select u.* from u", - "Table": "unsharded" + "Query": "with u as (select * from unsharded) select u.* from u" }, "TablesUsed": [ "main.unsharded" @@ -1443,7 +1383,6 @@ "OperatorType": "Join", "Variant": "Join", "JoinColumnIndexes": "L:0", - "TableName": "`user`_user_extra", "Inputs": [ { "OperatorType": "Route", @@ -1454,7 +1393,6 @@ }, "FieldQuery": "select t.id, t.col from (select `user`.id, `user`.col from `user` where 1 != 1) as t where 1 != 1", "Query": "select t.id, t.col from (select `user`.id, `user`.col from `user` where `user`.id = 5) as t", - "Table": "`user`", "Values": [ "5" ], @@ -1468,8 +1406,7 @@ "Sharded": true }, "FieldQuery": "select 1 from user_extra where 1 != 1", - "Query": "select 1 from user_extra", - "Table": "user_extra" + "Query": "select 1 from user_extra" } ] }, @@ -1490,7 +1427,6 @@ "OperatorType": "Join", "Variant": "Join", "JoinColumnIndexes": "L:0", - "TableName": "`user`_user_extra", "Inputs": [ { "OperatorType": "Route", @@ -1500,8 +1436,7 @@ "Sharded": true }, "FieldQuery": "select id + 1 from (select `user`.id, `user`.col from `user` where 1 != 1) as t where 1 != 1", - "Query": "select id + 1 from (select `user`.id, `user`.col from `user`) as t", - "Table": "`user`" + "Query": "select id + 1 from (select `user`.id, `user`.col from `user`) as t" }, { "OperatorType": "Route", @@ -1511,8 +1446,7 @@ "Sharded": true }, "FieldQuery": "select 1 from user_extra where 1 != 1", - "Query": "select 1 from user_extra", - "Table": "user_extra" + "Query": "select 1 from user_extra" } ] }, @@ -1550,7 +1484,6 @@ }, "FieldQuery": "select `name`, keyspace_id from name_user_vdx where 1 != 1", "Query": "select `name`, keyspace_id from name_user_vdx where `name` in ::__vals", - "Table": "name_user_vdx", "Values": [ "::name" ], @@ -1564,8 +1497,7 @@ "Sharded": true }, "FieldQuery": "select u.a from (select id as b, `name` from `user` where 1 != 1) as u(a, n) where 1 != 1", - "Query": "select u.a from (select id as b, `name` from `user` where `name` = 1) as u(a, n)", - "Table": "`user`" + "Query": "select u.a from (select id as b, `name` from `user` where `name` = 1) as u(a, n)" } ] }, @@ -1602,7 +1534,6 @@ }, "FieldQuery": "select `name`, keyspace_id from name_user_vdx where 1 != 1", "Query": "select `name`, keyspace_id from name_user_vdx where `name` in ::__vals", - "Table": "name_user_vdx", "Values": [ "::name" ], @@ -1616,8 +1547,7 @@ "Sharded": true }, "FieldQuery": "select u.a from (select id as b, `name` from `user` where 1 != 1) as u(a, n) where 1 != 1", - "Query": "select u.a from (select id as b, `name` from `user` where b = 1 and `name` = 1) as u(a, n)", - "Table": "`user`" + "Query": "select u.a from (select id as b, `name` from `user` where b = 1 and `name` = 1) as u(a, n)" } ] }, @@ -1637,7 +1567,6 @@ "OperatorType": "Join", "Variant": "Join", "JoinColumnIndexes": "L:0", - "TableName": "`user`_user_extra", "Inputs": [ { "OperatorType": "Route", @@ -1647,8 +1576,7 @@ "Sharded": true }, "FieldQuery": "select i + 1 from (select `user`.id from `user` where 1 != 1) as t(i) where 1 != 1", - "Query": "select i + 1 from (select `user`.id from `user`) as t(i)", - "Table": "`user`" + "Query": "select i + 1 from (select `user`.id from `user`) as t(i)" }, { "OperatorType": "Route", @@ -1658,8 +1586,7 @@ "Sharded": true }, "FieldQuery": "select 1 from user_extra where 1 != 1", - "Query": "select 1 from user_extra", - "Table": "user_extra" + "Query": "select 1 from user_extra" } ] }, @@ -1683,13 +1610,11 @@ "JoinVars": { "t_col1": 1 }, - "TableName": "`user`_unsharded_unsharded", "Inputs": [ { "OperatorType": "Join", "Variant": "Join", "JoinColumnIndexes": "L:0,L:1", - "TableName": "`user`_unsharded", "Inputs": [ { "OperatorType": "Route", @@ -1699,8 +1624,7 @@ "Sharded": true }, "FieldQuery": "select 0, t.col1 from (select `user`.col1 from `user` where 1 != 1) as t where 1 != 1", - "Query": "select 0, t.col1 from (select `user`.col1 from `user`) as t", - "Table": "`user`" + "Query": "select 0, t.col1 from (select `user`.col1 from `user`) as t" }, { "OperatorType": "Route", @@ -1710,8 +1634,7 @@ "Sharded": false }, "FieldQuery": "select 1 from unsharded where 1 != 1", - "Query": "select 1 from unsharded", - "Table": "unsharded" + "Query": "select 1 from unsharded" } ] }, @@ -1723,8 +1646,7 @@ "Sharded": false }, "FieldQuery": "select 1 from unsharded where 1 != 1", - "Query": "select 1 from unsharded where unsharded.a = :t_col1 and unsharded.col1 = :t_col1", - "Table": "unsharded" + "Query": "select 1 from unsharded where unsharded.a = :t_col1 and unsharded.col1 = :t_col1" } ] }, @@ -1749,8 +1671,7 @@ "Sharded": true }, "FieldQuery": "select id2 from (select id from `user` where 1 != 1) as x(id2) where 1 != 1", - "Query": "select id2 from (select id from `user`) as x(id2)", - "Table": "`user`" + "Query": "select id2 from (select id from `user`) as x(id2)" }, "TablesUsed": [ "user.user" @@ -1772,8 +1693,7 @@ "Sharded": false }, "FieldQuery": "with u as (select col from unsharded join unsharded_b where 1 != 1) select col from u join unsharded_a as ua where 1 != 1", - "Query": "with u as (select col from unsharded join unsharded_b) select col from u join unsharded_a as ua limit 1", - "Table": "unsharded, unsharded_a, unsharded_b" + "Query": "with u as (select col from unsharded join unsharded_b) select col from u join unsharded_a as ua limit 1" }, "TablesUsed": [ "main.unsharded", @@ -1797,13 +1717,11 @@ "OperatorType": "Join", "Variant": "Join", "JoinColumnIndexes": "L:0", - "TableName": "`user`_user_extra_user_extra", "Inputs": [ { "OperatorType": "Join", "Variant": "Join", "JoinColumnIndexes": "L:0", - "TableName": "`user`_user_extra", "Inputs": [ { "OperatorType": "Route", @@ -1813,8 +1731,7 @@ "Sharded": true }, "FieldQuery": "select u.col from (select `user`.col from `user` where 1 != 1) as u where 1 != 1", - "Query": "select u.col from (select `user`.col from `user`) as u", - "Table": "`user`" + "Query": "select u.col from (select `user`.col from `user`) as u" }, { "OperatorType": "Route", @@ -1824,8 +1741,7 @@ "Sharded": true }, "FieldQuery": "select 1 from user_extra where 1 != 1", - "Query": "select 1 from user_extra", - "Table": "user_extra" + "Query": "select 1 from user_extra" } ] }, @@ -1841,8 +1757,7 @@ "Sharded": true }, "FieldQuery": "select 1 from user_extra as ue where 1 != 1", - "Query": "select 1 from user_extra as ue limit 1", - "Table": "user_extra" + "Query": "select 1 from user_extra as ue limit 1" } ] } @@ -1871,8 +1786,7 @@ "Sharded": true }, "FieldQuery": "select * from (select * from `user` where 1 != 1) as x where 1 != 1", - "Query": "select * from (select * from `user`) as x", - "Table": "`user`" + "Query": "select * from (select * from `user`) as x" }, "TablesUsed": [ "user.user" @@ -1902,8 +1816,7 @@ "Sharded": true }, "FieldQuery": "select dt.c0 as id, dt.c1 as foo, weight_string(dt.c0), weight_string(dt.c1) from (select id, foo from (select id, foo from `user` where 1 != 1) as x where 1 != 1 union select id, foo from (select id, foo from `user` where 1 != 1) as x where 1 != 1) as dt(c0, c1) where 1 != 1", - "Query": "select dt.c0 as id, dt.c1 as foo, weight_string(dt.c0), weight_string(dt.c1) from (select id, foo from (select id, foo from `user`) as x union select id, foo from (select id, foo from `user`) as x) as dt(c0, c1)", - "Table": "`user`" + "Query": "select dt.c0 as id, dt.c1 as foo, weight_string(dt.c0), weight_string(dt.c1) from (select id, foo from (select id, foo from `user`) as x union select id, foo from (select id, foo from `user`) as x) as dt(c0, c1)" } ] }, @@ -1927,8 +1840,7 @@ "Sharded": false }, "FieldQuery": "with recursive cte(n) as (select 1 from dual where 1 != 1 union all select n + 1 from cte where 1 != 1) select cte.n from unsharded join cte on unsharded.id = cte.n where 1 != 1", - "Query": "with recursive cte(n) as (select 1 from dual union all select n + 1 from cte where n < 5) select cte.n from unsharded join cte on unsharded.id = cte.n", - "Table": "dual, unsharded" + "Query": "with recursive cte(n) as (select 1 from dual union all select n + 1 from cte where n < 5) select cte.n from unsharded join cte on unsharded.id = cte.n" }, "TablesUsed": [ "main.dual", @@ -1951,8 +1863,7 @@ "Sharded": false }, "FieldQuery": "select 'count_a' as tab, num from count_a where 1 != 1 union select 'count_b' as tab, num from count_b where 1 != 1", - "Query": "with count_a as (select count(id) as num from unsharded_a) , count_b as (select count(id) as num from unsharded_b) select 'count_a' as tab, num from count_a union select 'count_b' as tab, num from count_b", - "Table": "unsharded_a, unsharded_b" + "Query": "with count_a as (select count(id) as num from unsharded_a) , count_b as (select count(id) as num from unsharded_b) select 'count_a' as tab, num from count_a union select 'count_b' as tab, num from count_b" }, "TablesUsed": [ "main.unsharded_a", @@ -1997,8 +1908,7 @@ "Sharded": true }, "FieldQuery": "select count(user_id) as num from user_metadata where 1 != 1", - "Query": "select count(user_id) as num from user_metadata", - "Table": "user_metadata" + "Query": "select count(user_id) as num from user_metadata" } ] } @@ -2024,8 +1934,7 @@ "Sharded": true }, "FieldQuery": "select count(user_id) as num from user_extra where 1 != 1", - "Query": "select count(user_id) as num from user_extra", - "Table": "user_extra" + "Query": "select count(user_id) as num from user_extra" } ] } @@ -2107,8 +2016,7 @@ "Sharded": true }, "FieldQuery": "select 1 from (select `user`.id from `user` where 1 != 1) as t where 1 != 1", - "Query": "select 1 from (select `user`.id from `user` where `user`.textcol1 = 'open' and `user`.intcol = 1) as t limit :__upper_limit", - "Table": "`user`" + "Query": "select 1 from (select `user`.id from `user` where `user`.textcol1 = 'open' and `user`.intcol = 1) as t limit :__upper_limit" } ] } @@ -2145,8 +2053,7 @@ "Sharded": true }, "FieldQuery": "select 1 from (select `user`.id from `user` where 1 != 1) as t where 1 != 1", - "Query": "select 1 from (select `user`.id from `user` where `user`.textcol1 = 'closed' and `user`.intcol = 1) as t limit :__upper_limit", - "Table": "`user`" + "Query": "select 1 from (select `user`.id from `user` where `user`.textcol1 = 'closed' and `user`.intcol = 1) as t limit :__upper_limit" } ] } @@ -2201,8 +2108,7 @@ "Sharded": true }, "FieldQuery": "select `name`, id from `user` where 1 != 1", - "Query": "select `name`, id from `user` where manager_id is null", - "Table": "`user`" + "Query": "select `name`, id from `user` where manager_id is null" }, { "OperatorType": "Route", @@ -2212,8 +2118,7 @@ "Sharded": true }, "FieldQuery": "select e.`name`, e.id from `user` as e where 1 != 1", - "Query": "select e.`name`, e.id from `user` as e where e.manager_id = :cte_id", - "Table": "`user`, dual" + "Query": "select e.`name`, e.id from `user` as e where e.manager_id = :cte_id" } ] } @@ -2253,8 +2158,7 @@ "Sharded": true }, "FieldQuery": "select `name`, id from `user` where 1 != 1", - "Query": "select `name`, id from `user` where manager_id is null", - "Table": "`user`" + "Query": "select `name`, id from `user` where manager_id is null" }, { "OperatorType": "Route", @@ -2264,8 +2168,7 @@ "Sharded": true }, "FieldQuery": "select e.`name`, e.id from `user` as e where 1 != 1", - "Query": "select e.`name`, e.id from `user` as e where e.manager_id = :cte_id", - "Table": "`user`, dual" + "Query": "select e.`name`, e.id from `user` as e where e.manager_id = :cte_id" } ] } @@ -2292,8 +2195,7 @@ "Sharded": false }, "FieldQuery": "with recursive cte as (select 1 as n from dual where 1 != 1 union all select n + 1 from cte where 1 != 1) select n from cte where 1 != 1", - "Query": "with recursive cte as (select 1 as n from dual union all select n + 1 from cte where n < 5) select n from cte", - "Table": "dual" + "Query": "with recursive cte as (select 1 as n from dual union all select n + 1 from cte where n < 5) select n from cte" }, "TablesUsed": [ "main.dual" @@ -2315,8 +2217,7 @@ "Sharded": false }, "FieldQuery": "with recursive cte(n) as (select 1 from dual where 1 != 1 union all select n + 1 from cte where 1 != 1) select n from cte where 1 != 1", - "Query": "with recursive cte(n) as (select 1 from dual union all select n + 1 from cte where n < 5) select n from cte", - "Table": "dual" + "Query": "with recursive cte(n) as (select 1 from dual union all select n + 1 from cte where n < 5) select n from cte" }, "TablesUsed": [ "main.dual" @@ -2339,7 +2240,6 @@ }, "FieldQuery": "with recursive emp_cte as (select id, 1 as `level` from `user` where 1 != 1 union all select e.id, cte.`level` + 1 from cte as cte, `user` as e where 1 != 1) select id, `level` from emp_cte where 1 != 1", "Query": "with recursive emp_cte as (select id, 1 as `level` from `user` where manager_id is null and id = 6 union all select e.id, cte.`level` + 1 from cte as cte, `user` as e where e.manager_id = cte.id and e.id = 6) select id, `level` from emp_cte", - "Table": "`user`, dual", "Values": [ "6" ], @@ -2373,8 +2273,7 @@ "Sharded": true }, "FieldQuery": "select id, 1 as `level` from `user` where 1 != 1", - "Query": "select id, 1 as `level` from `user` where manager_id is null", - "Table": "`user`" + "Query": "select id, 1 as `level` from `user` where manager_id is null" }, { "OperatorType": "Route", @@ -2384,8 +2283,7 @@ "Sharded": true }, "FieldQuery": "select e.id, :cte_level + 1 as `cte.``level`` + 1` from `user` as e where 1 != 1", - "Query": "select e.id, :cte_level + 1 as `cte.``level`` + 1` from `user` as e where e.manager_id = :cte_id", - "Table": "`user`, dual" + "Query": "select e.id, :cte_level + 1 as `cte.``level`` + 1` from `user` as e where e.manager_id = :cte_id" } ] }, @@ -2409,7 +2307,6 @@ "JoinVars": { "l_id": 0 }, - "TableName": "dual_`user`", "Inputs": [ { "OperatorType": "Route", @@ -2419,8 +2316,7 @@ "Sharded": false }, "FieldQuery": "with recursive literal_cte as (select 1 as id, 100 as `value`, 1 as manager_id from dual where 1 != 1 union all select id + 1, `value` * 2, id from literal_cte where 1 != 1) select l.id, l.`value`, l.manager_id from literal_cte as l where 1 != 1", - "Query": "with recursive literal_cte as (select 1 as id, 100 as `value`, 1 as manager_id from dual union all select id + 1, `value` * 2, id from literal_cte where id < 5) select l.id, l.`value`, l.manager_id from literal_cte as l", - "Table": "dual" + "Query": "with recursive literal_cte as (select 1 as id, 100 as `value`, 1 as manager_id from dual union all select id + 1, `value` * 2, id from literal_cte where id < 5) select l.id, l.`value`, l.manager_id from literal_cte as l" }, { "OperatorType": "Route", @@ -2431,7 +2327,6 @@ }, "FieldQuery": "select e.`name` as employee_name from `user` as e where 1 != 1", "Query": "select e.`name` as employee_name from `user` as e where e.id = :l_id", - "Table": "`user`", "Values": [ ":l_id" ], @@ -2486,8 +2381,7 @@ "Sharded": true }, "FieldQuery": "select dt.c0 as id, dt.c1 as `name`, dt.c2 as manager_id, weight_string(dt.c2) from (select id, `name`, manager_id from `user` where 1 != 1) as dt(c0, c1, c2) where 1 != 1", - "Query": "select dt.c0 as id, dt.c1 as `name`, dt.c2 as manager_id, weight_string(dt.c2) from (select id, `name`, manager_id from `user` where manager_id is null) as dt(c0, c1, c2)", - "Table": "`user`" + "Query": "select dt.c0 as id, dt.c1 as `name`, dt.c2 as manager_id, weight_string(dt.c2) from (select id, `name`, manager_id from `user` where manager_id is null) as dt(c0, c1, c2)" }, { "OperatorType": "Route", @@ -2497,8 +2391,7 @@ "Sharded": true }, "FieldQuery": "select e.id, e.`name`, e.manager_id, weight_string(e.manager_id) from `user` as e where 1 != 1", - "Query": "select e.id, e.`name`, e.manager_id, weight_string(e.manager_id) from `user` as e where e.manager_id = :cte_id", - "Table": "`user`, dual" + "Query": "select e.id, e.`name`, e.manager_id, weight_string(e.manager_id) from `user` as e where e.manager_id = :cte_id" } ] } @@ -2530,7 +2423,6 @@ }, "FieldQuery": "with recursive cte as (select id from `user` where 1 != 1 union all select id + 1 from cte where 1 != 1) select id from cte where 1 != 1", "Query": "with recursive cte as (select id from `user` where id = 72 union all select id + 1 from cte where id < 100) select id from cte", - "Table": "`user`, dual", "Values": [ "72" ], @@ -2557,8 +2449,7 @@ "Sharded": true }, "FieldQuery": "with recursive cte as (select ue.id, ue.foo from `user` as u, user_extra as ue where 1 != 1 union all select sr.id, sr.foo from ref_with_source as sr, ref as rr where 1 != 1) select id, foo from cte where 1 != 1", - "Query": "with recursive cte as (select ue.id, ue.foo from `user` as u, user_extra as ue where u.id = ue.user_id union all select sr.id, sr.foo from ref_with_source as sr, ref as rr where sr.foo = cte.foo and rr.bar = sr.bar) select id, foo from cte", - "Table": "`user`, ref, ref_with_source, user_extra" + "Query": "with recursive cte as (select ue.id, ue.foo from `user` as u, user_extra as ue where u.id = ue.user_id union all select sr.id, sr.foo from ref_with_source as sr, ref as rr where sr.foo = cte.foo and rr.bar = sr.bar) select id, foo from cte" }, "TablesUsed": [ "user.ref", @@ -2583,8 +2474,7 @@ "Sharded": true }, "FieldQuery": "with recursive cte as (select 1 from ref_with_source as sr, ref as rr where 1 != 1 union all select ue.id, ue.foo from cte, user_extra as ue, `user` as u where 1 != 1) select id, foo from cte where 1 != 1", - "Query": "with recursive cte as (select 1 from ref_with_source as sr, ref as rr where rr.bar = sr.bar union all select ue.id, ue.foo from cte, user_extra as ue, `user` as u where cte.foo = ue.foo and ue.user_id = u.id) select id, foo from cte", - "Table": "`user`, dual, ref, ref_with_source, user_extra" + "Query": "with recursive cte as (select 1 from ref_with_source as sr, ref as rr where rr.bar = sr.bar union all select ue.id, ue.foo from cte, user_extra as ue, `user` as u where cte.foo = ue.foo and ue.user_id = u.id) select id, foo from cte" }, "TablesUsed": [ "main.dual", @@ -2610,8 +2500,7 @@ "Sharded": true }, "FieldQuery": "with recursive hierarchy as (select id, `name`, manager_id from `user` where 1 != 1 union all select id, `name`, manager_id from `user` where 1 != 1 union select id * 2, `name`, manager_id from hierarchy where 1 != 1) select id, `name`, manager_id from hierarchy where 1 != 1", - "Query": "with recursive hierarchy as (select id, `name`, manager_id from `user` union all select id, `name`, manager_id from `user` union select id * 2, `name`, manager_id from hierarchy where id < 10) select id, `name`, manager_id from hierarchy", - "Table": "`user`, dual" + "Query": "with recursive hierarchy as (select id, `name`, manager_id from `user` union all select id, `name`, manager_id from `user` union select id * 2, `name`, manager_id from hierarchy where id < 10) select id, `name`, manager_id from hierarchy" }, "TablesUsed": [ "main.dual", @@ -2634,8 +2523,7 @@ "Sharded": false }, "FieldQuery": "select a from (select 1 from dual where 1 != 1 union all select 2 from dual where 1 != 1) as dt(a) where 1 != 1", - "Query": "select a from (select 1 from dual union all select 2 from dual) as dt(a) where exists (with recursive qn as (select a * 0 as b from dual union all select b + 1 from qn where b = 0) select 1 from qn where b = a)", - "Table": "dual" + "Query": "select a from (select 1 from dual union all select 2 from dual) as dt(a) where exists (with recursive qn as (select a * 0 as b from dual union all select b + 1 from qn where b = 0) select 1 from qn where b = a)" }, "TablesUsed": [ "main.dual" diff --git a/go/vt/vtgate/planbuilder/testdata/dml_cases.json b/go/vt/vtgate/planbuilder/testdata/dml_cases.json index 53937fa739c..08e15c7fe53 100644 --- a/go/vt/vtgate/planbuilder/testdata/dml_cases.json +++ b/go/vt/vtgate/planbuilder/testdata/dml_cases.json @@ -25,8 +25,7 @@ "Name": "main", "Sharded": false }, - "Query": "update m1 set val = 1", - "Table": "m1" + "Query": "update m1 set val = 1" }, "TablesUsed": [ "main.m1" @@ -48,8 +47,7 @@ "Name": "main", "Sharded": false }, - "Query": "update unsharded set val = 1", - "Table": "unsharded" + "Query": "update unsharded set val = 1" }, "TablesUsed": [ "main.unsharded" @@ -71,8 +69,7 @@ "Name": "main", "Sharded": false }, - "Query": "update unsharded set col = (select col from unsharded limit 1)", - "Table": "unsharded" + "Query": "update unsharded set col = (select col from unsharded limit 1)" }, "TablesUsed": [ "main.unsharded" @@ -94,8 +91,7 @@ "Name": "main", "Sharded": false }, - "Query": "update unsharded set col = (select id from unsharded union select id from unsharded)", - "Table": "unsharded" + "Query": "update unsharded set col = (select id from unsharded union select id from unsharded)" }, "TablesUsed": [ "main.unsharded" @@ -117,8 +113,7 @@ "Name": "main", "Sharded": false }, - "Query": "update unsharded set col = (select id from unsharded as a join unsharded as b on a.id = b.id)", - "Table": "unsharded" + "Query": "update unsharded set col = (select id from unsharded as a join unsharded as b on a.id = b.id)" }, "TablesUsed": [ "main.unsharded" @@ -140,8 +135,7 @@ "Name": "main", "Sharded": false }, - "Query": "update unsharded as foo left join (select id from unsharded where col is not null order by col desc limit 10) as keepers on foo.id = keepers.id set col1 = 'asdf' where keepers.id is null and foo.col is not null and foo.col < 1000", - "Table": "unsharded" + "Query": "update unsharded as foo left join (select id from unsharded where col is not null order by col desc limit 10) as keepers on foo.id = keepers.id set col1 = 'asdf' where keepers.id is null and foo.col is not null and foo.col < 1000" }, "TablesUsed": [ "main.unsharded" @@ -164,7 +158,6 @@ "Sharded": true }, "Query": "update `user` as route1 set a = 1 where id = 1", - "Table": "user", "Values": [ "1" ], @@ -190,8 +183,7 @@ "Name": "main", "Sharded": false }, - "Query": "update unsharded_a set a = (select a from unsharded as route2)", - "Table": "unsharded, unsharded_a" + "Query": "update unsharded_a set a = (select a from unsharded as route2)" }, "TablesUsed": [ "main.unsharded", @@ -214,8 +206,7 @@ "Name": "main", "Sharded": false }, - "Query": "delete from unsharded", - "Table": "unsharded" + "Query": "delete from unsharded" }, "TablesUsed": [ "main.unsharded" @@ -237,8 +228,7 @@ "Name": "main", "Sharded": false }, - "Query": "delete from seq", - "Table": "seq" + "Query": "delete from seq" }, "TablesUsed": [ "main.seq" @@ -260,8 +250,7 @@ "Name": "main", "Sharded": false }, - "Query": "delete from unsharded_ref", - "Table": "unsharded_ref" + "Query": "delete from unsharded_ref" }, "TablesUsed": [ "main.unsharded_ref" @@ -284,7 +273,6 @@ "Sharded": true }, "Query": "update `user` set val = 1 where id = 1", - "Table": "user", "Values": [ "1" ], @@ -311,7 +299,6 @@ "Sharded": true }, "Query": "update `user` as user_alias set val = 1 where user_alias.id = 1", - "Table": "user", "Values": [ "1" ], @@ -338,7 +325,6 @@ "Sharded": true }, "Query": "update `user` set val = 1 where id = 1", - "Table": "user", "Values": [ "1" ], @@ -365,7 +351,6 @@ "Sharded": true }, "Query": "update `user` set val = 1 where `name` = 'foo' and id = 1", - "Table": "user", "Values": [ "1" ], @@ -398,7 +383,6 @@ "KsidVindex": "user_index", "OwnedVindexQuery": "select user_id, email, address, non_planable, email = 'juan@vitess.io' from user_metadata where user_id = 1 for update", "Query": "update user_metadata set email = 'juan@vitess.io' where user_id = 1", - "Table": "user_metadata", "Values": [ "1" ], @@ -438,7 +422,6 @@ "KsidVindex": "user_index", "OwnedVindexQuery": "select user_id, email, address, non_planable, email = 'juan@vitess.io', address = '155 5th street' from user_metadata where user_id = 1 for update", "Query": "update user_metadata set email = 'juan@vitess.io', address = '155 5th street' where user_id = 1", - "Table": "user_metadata", "Values": [ "1" ], @@ -471,7 +454,6 @@ "KsidVindex": "user_index", "OwnedVindexQuery": "select user_id, email, address, non_planable, email = 'juan@vitess.io' from user_metadata where user_id = 1 order by user_id asc limit 10 for update", "Query": "update user_metadata set email = 'juan@vitess.io' where user_id = 1 order by user_id asc limit 10", - "Table": "user_metadata", "Values": [ "1" ], @@ -504,7 +486,6 @@ "KsidVindex": "user_index", "OwnedVindexQuery": "select user_id, music_id = 1 from music_extra where user_id = 1 for update", "Query": "update music_extra set music_id = 1 where user_id = 1", - "Table": "music_extra", "Values": [ "1" ], @@ -531,7 +512,6 @@ "Sharded": true }, "Query": "update `user` set val = 1 where id = id2 and id = 1", - "Table": "user", "Values": [ "1" ], @@ -558,7 +538,6 @@ "Sharded": true }, "Query": "update `user` set val = 1 where id = 18446744073709551616 and id = 1", - "Table": "user", "Values": [ "1" ], @@ -588,7 +567,6 @@ "KsidVindex": "user_index", "OwnedVindexQuery": "select Id, `Name`, Costly from `user` where id = 1 for update", "Query": "delete from `user` where id = 1", - "Table": "user", "Values": [ "1" ], @@ -614,8 +592,7 @@ "Name": "main", "Sharded": false }, - "Query": "delete a from unsharded_a as a, unsharded_b as b where a.id = b.id and b.val = 1", - "Table": "unsharded_a, unsharded_b" + "Query": "delete a from unsharded_a as a, unsharded_b as b where a.id = b.id and b.val = 1" }, "TablesUsed": [ "main.unsharded_a", @@ -638,8 +615,7 @@ "Name": "main", "Sharded": false }, - "Query": "delete a from unsharded_a as a join unsharded_b as b on a.id = b.id where b.val = 1", - "Table": "unsharded_a, unsharded_b" + "Query": "delete a from unsharded_a as a join unsharded_b as b on a.id = b.id where b.val = 1" }, "TablesUsed": [ "main.unsharded_a", @@ -662,8 +638,7 @@ "Name": "main", "Sharded": false }, - "Query": "delete foo from unsharded as foo left join (select id from unsharded where col is not null order by col desc limit 10) as keepers on foo.id = keepers.id where keepers.id is null and foo.col is not null and foo.col < 1000", - "Table": "unsharded" + "Query": "delete foo from unsharded as foo left join (select id from unsharded where col is not null order by col desc limit 10) as keepers on foo.id = keepers.id where keepers.id is null and foo.col is not null and foo.col < 1000" }, "TablesUsed": [ "main.unsharded" @@ -689,7 +664,6 @@ "KsidVindex": "user_index", "OwnedVindexQuery": "select Id, `Name`, Costly from `user` as route1 where id = 1 for update", "Query": "delete from `user` as route1 where id = 1", - "Table": "user", "Values": [ "1" ], @@ -715,8 +689,7 @@ "Name": "main", "Sharded": false }, - "Query": "delete from unsharded_a where a = (select a from unsharded as route2)", - "Table": "unsharded, unsharded_a" + "Query": "delete from unsharded_a where a = (select a from unsharded as route2)" }, "TablesUsed": [ "main.unsharded", @@ -740,7 +713,6 @@ "Sharded": true }, "Query": "update music set val = 1 where id = 1", - "Table": "music", "Values": [ "1" ], @@ -766,8 +738,7 @@ "Name": "main", "Sharded": false }, - "Query": "update unsharded_a as a join unsharded_b as b on a.id = b.id set a.val = 'foo' where b.val = 1", - "Table": "unsharded_a, unsharded_b" + "Query": "update unsharded_a as a join unsharded_b as b on a.id = b.id set a.val = 'foo' where b.val = 1" }, "TablesUsed": [ "main.unsharded_a", @@ -790,8 +761,7 @@ "Name": "main", "Sharded": false }, - "Query": "update unsharded_a as a, unsharded_b as b set a.val = 'foo' where a.id = b.id and b.val = 1", - "Table": "unsharded_a, unsharded_b" + "Query": "update unsharded_a as a, unsharded_b as b set a.val = 'foo' where a.id = b.id and b.val = 1" }, "TablesUsed": [ "main.unsharded_a", @@ -818,7 +788,6 @@ "KsidVindex": "user_index", "OwnedVindexQuery": "select user_id, id from music where id = 1 for update", "Query": "delete from music where id = 1", - "Table": "music", "Values": [ "1" ], @@ -845,7 +814,6 @@ "Sharded": true }, "Query": "delete from music_extra where user_id = 1", - "Table": "music_extra", "Values": [ "1" ], @@ -871,8 +839,7 @@ "Name": "main", "Sharded": false }, - "Query": "insert into unsharded values ()", - "TableName": "unsharded" + "Query": "insert into unsharded values ()" }, "TablesUsed": [ "main.unsharded" @@ -894,8 +861,7 @@ "Name": "main", "Sharded": false }, - "Query": "insert into unsharded values (1, 2)", - "TableName": "unsharded" + "Query": "insert into unsharded values (1, 2)" }, "TablesUsed": [ "main.unsharded" @@ -917,8 +883,7 @@ "Name": "main", "Sharded": false }, - "Query": "insert into unsharded values (1, 2) on duplicate key update x = 3", - "TableName": "unsharded" + "Query": "insert into unsharded values (1, 2) on duplicate key update x = 3" }, "TablesUsed": [ "main.unsharded" @@ -941,8 +906,7 @@ "Sharded": false }, "AutoIncrement": "select next :n /* INT64 */ values from seq:Values::(1)", - "Query": "insert into unsharded_authoritative(col1, col2) values (:__seq0, 1)", - "TableName": "unsharded_authoritative" + "Query": "insert into unsharded_authoritative(col1, col2) values (:__seq0, 1)" }, "TablesUsed": [ "main.unsharded_authoritative" @@ -966,7 +930,6 @@ }, "InsertIgnore": true, "Query": "insert into music(user_id, id) values (:_user_id_0, :_id_0) on duplicate key update user_id = values(user_id)", - "TableName": "music", "VindexValues": { "music_user_map": "2", "user_index": "1" @@ -994,7 +957,6 @@ }, "InsertIgnore": true, "Query": "insert into music(user_id, id) values (:_user_id_0, :_id_0), (:_user_id_1, :_id_1) on duplicate key update user_id = values(user_id)", - "TableName": "music", "VindexValues": { "music_user_map": "2, 4", "user_index": "1, 3" @@ -1020,8 +982,7 @@ "Name": "main", "Sharded": false }, - "Query": "insert into unsharded select id from unsharded_auto", - "TableName": "unsharded" + "Query": "insert into unsharded select id from unsharded_auto" }, "TablesUsed": [ "main.unsharded", @@ -1044,8 +1005,7 @@ "Name": "main", "Sharded": false }, - "Query": "insert into unsharded select id from unsharded join unsharded_auto", - "TableName": "unsharded" + "Query": "insert into unsharded select id from unsharded join unsharded_auto" }, "TablesUsed": [ "main.unsharded", @@ -1069,8 +1029,7 @@ "Sharded": false }, "AutoIncrement": "select next :n /* INT64 */ values from seq:Values::(18446744073709551616)", - "Query": "insert into unsharded_auto(id, val) values (:__seq0, 'aa')", - "TableName": "unsharded_auto" + "Query": "insert into unsharded_auto(id, val) values (:__seq0, 'aa')" }, "TablesUsed": [ "main.unsharded_auto" @@ -1093,8 +1052,7 @@ "Sharded": false }, "AutoIncrement": "select next :n /* INT64 */ values from seq:Values::(1)", - "Query": "insert into unsharded_auto(id, val) values (:__seq0, 'aa')", - "TableName": "unsharded_auto" + "Query": "insert into unsharded_auto(id, val) values (:__seq0, 'aa')" }, "TablesUsed": [ "main.unsharded_auto" @@ -1117,8 +1075,7 @@ "Sharded": false }, "AutoIncrement": "select next :n /* INT64 */ values from seq:Values::(null)", - "Query": "insert into unsharded_auto(val, id) values ('aa', :__seq0)", - "TableName": "unsharded_auto" + "Query": "insert into unsharded_auto(val, id) values ('aa', :__seq0)" }, "TablesUsed": [ "main.unsharded_auto" @@ -1141,8 +1098,7 @@ "Sharded": false }, "AutoIncrement": "select next :n /* INT64 */ values from seq:Values::(null)", - "Query": "insert into unsharded_auto(val, id) values (false, :__seq0)", - "TableName": "unsharded_auto" + "Query": "insert into unsharded_auto(val, id) values (false, :__seq0)" }, "TablesUsed": [ "main.unsharded_auto" @@ -1165,8 +1121,7 @@ "Sharded": false }, "AutoIncrement": "select next :n /* INT64 */ values from seq:Values::(1, null)", - "Query": "insert into unsharded_auto(id, val) values (:__seq0, 'aa'), (:__seq1, 'bb')", - "TableName": "unsharded_auto" + "Query": "insert into unsharded_auto(id, val) values (:__seq0, 'aa'), (:__seq1, 'bb')" }, "TablesUsed": [ "main.unsharded_auto" @@ -1188,8 +1143,7 @@ "Name": "main", "Sharded": false }, - "Query": "insert into unsharded values (1, 1)", - "TableName": "unsharded" + "Query": "insert into unsharded values (1, 1)" }, "TablesUsed": [ "main.unsharded" @@ -1213,7 +1167,6 @@ }, "AutoIncrement": "select next :n /* INT64 */ values from seq:Values::(1)", "Query": "insert into `user`(id, val, `Name`, Costly) values (:_Id_0, 1, :_Name_0, :_Costly_0)", - "TableName": "user", "VindexValues": { "costly_map": "null", "name_user_map": "null", @@ -1242,7 +1195,6 @@ }, "AutoIncrement": "select next :n /* INT64 */ values from seq:Values::(1)", "Query": "insert into `user`(id, `Name`, Costly) values (:_Id_0, :_Name_0, :_Costly_0)", - "TableName": "user", "VindexValues": { "costly_map": "null", "name_user_map": "null", @@ -1276,7 +1228,6 @@ "Sharded": true }, "Query": "insert into authoritative(user_id, col1, col2) values (:_user_id_0, 2, 3)", - "TableName": "authoritative", "VindexValues": { "user_index": "1" } @@ -1303,7 +1254,6 @@ }, "AutoIncrement": "select next :n /* INT64 */ values from seq:Values::(null)", "Query": "insert into `user`(id, `Name`, Costly) values (:_Id_0, :_Name_0, :_Costly_0)", - "TableName": "user", "VindexValues": { "costly_map": "null", "name_user_map": "null", @@ -1332,7 +1282,6 @@ }, "AutoIncrement": "select next :n /* INT64 */ values from seq:Values::(1)", "Query": "insert into `user`(id, `Name`, Costly) values (:_Id_0, :_Name_0, :_Costly_0)", - "TableName": "user", "VindexValues": { "costly_map": "null", "name_user_map": "null", @@ -1362,7 +1311,6 @@ "AutoIncrement": "select next :n /* INT64 */ values from seq:Values::(1)", "InsertIgnore": true, "Query": "insert ignore into `user`(id, `Name`, Costly) values (:_Id_0, :_Name_0, :_Costly_0)", - "TableName": "user", "VindexValues": { "costly_map": "null", "name_user_map": "null", @@ -1392,7 +1340,6 @@ "AutoIncrement": "select next :n /* INT64 */ values from seq:Values::(1)", "InsertIgnore": true, "Query": "insert into `user`(id, `Name`, Costly) values (:_Id_0, :_Name_0, :_Costly_0) on duplicate key update col = 2", - "TableName": "user", "VindexValues": { "costly_map": "null", "name_user_map": "null", @@ -1421,7 +1368,6 @@ }, "AutoIncrement": "select next :n /* INT64 */ values from seq:Values::(:aa)", "Query": "insert into `user`(id, `Name`, Costly) values (:_Id_0, :_Name_0, :_Costly_0)", - "TableName": "user", "VindexValues": { "costly_map": "null", "name_user_map": "null", @@ -1450,7 +1396,6 @@ }, "AutoIncrement": "select next :n /* INT64 */ values from seq:Values::(null)", "Query": "insert into `user`(nonid, id, `Name`, Costly) values (2, :_Id_0, :_Name_0, :_Costly_0)", - "TableName": "user", "VindexValues": { "costly_map": "null", "name_user_map": "null", @@ -1479,7 +1424,6 @@ }, "AutoIncrement": "select next :n /* INT64 */ values from seq:Values::(null)", "Query": "insert into `user`(id, nonid, `Name`, Costly) values (:_Id_0, 2, :_Name_0, :_Costly_0)", - "TableName": "user", "VindexValues": { "costly_map": "null", "name_user_map": "null", @@ -1508,7 +1452,6 @@ }, "AutoIncrement": "select next :n /* INT64 */ values from seq:Values::(null)", "Query": "insert into `user`(nonid, id, `Name`, Costly) values (true, :_Id_0, :_Name_0, :_Costly_0)", - "TableName": "user", "VindexValues": { "costly_map": "null", "name_user_map": "null", @@ -1537,7 +1480,6 @@ }, "AutoIncrement": "select next :n /* INT64 */ values from seq:Values::(1)", "Query": "insert into `user`(nonid, `name`, id, Costly) values (2, :_Name_0, :_Id_0, :_Costly_0)", - "TableName": "user", "VindexValues": { "costly_map": "null", "name_user_map": "'foo'", @@ -1566,7 +1508,6 @@ }, "AutoIncrement": "select next :n /* INT64 */ values from seq:Values::(null)", "Query": "insert into user_extra(nonid, extra_id, user_id) values (2, :__seq0, :_user_id_0)", - "TableName": "user_extra", "VindexValues": { "user_index": "null" } @@ -1592,7 +1533,6 @@ "Sharded": true }, "Query": "insert into `weird``name`(`a``b*c`, `b*c`) values (:_a_b_c_0, 2)", - "TableName": "weird`name", "VindexValues": { "user_index": "1" } @@ -1617,8 +1557,7 @@ "Name": "main", "Sharded": false }, - "Query": "insert into unsharded select 1 from dual union select 1 from dual", - "TableName": "unsharded" + "Query": "insert into unsharded select 1 from dual union select 1 from dual" }, "TablesUsed": [ "main.dual", @@ -1643,7 +1582,6 @@ }, "AutoIncrement": "select next :n /* INT64 */ values from seq:Values::(18446744073709551616)", "Query": "insert into user_extra(nonid, extra_id, user_id) values (2, :__seq0, :_user_id_0)", - "TableName": "user_extra", "VindexValues": { "user_index": "null" } @@ -1669,7 +1607,6 @@ "Sharded": true }, "Query": "insert into music_extra(music_id, user_id) values (:_music_id_0, :_user_id_0)", - "TableName": "music_extra", "VindexValues": { "music_user_map": "1", "user_index": "18446744073709551616" @@ -1709,7 +1646,6 @@ }, "AutoIncrement": "select next :n /* INT64 */ values from seq:Values::(1, 2)", "Query": "insert into `user`(id, `Name`, Costly) values (:_Id_0, :_Name_0, :_Costly_0), (:_Id_1, :_Name_1, :_Costly_1)", - "TableName": "user", "VindexValues": { "costly_map": "null, null", "name_user_map": "null, null", @@ -1739,7 +1675,6 @@ "AutoIncrement": "select next :n /* INT64 */ values from seq:Values::(1, 2)", "Query": "insert /*vt+ QUERY_TIMEOUT_MS=1 */ into `user`(id, `Name`, Costly) values (:_Id_0, :_Name_0, :_Costly_0), (:_Id_1, :_Name_1, :_Costly_1)", "QueryTimeout": 1, - "TableName": "user", "VindexValues": { "costly_map": "null, null", "name_user_map": "null, null", @@ -1769,7 +1704,6 @@ "AutoIncrement": "select next :n /* INT64 */ values from seq:Values::(1, 2)", "MultiShardAutocommit": true, "Query": "insert /*vt+ MULTI_SHARD_AUTOCOMMIT=1 */ into `user`(id, `Name`, Costly) values (:_Id_0, :_Name_0, :_Costly_0), (:_Id_1, :_Name_1, :_Costly_1)", - "TableName": "user", "VindexValues": { "costly_map": "null, null", "name_user_map": "null, null", @@ -1802,8 +1736,7 @@ "Name": "main", "Sharded": false }, - "Query": "replace into unsharded values (1, 2)", - "TableName": "unsharded" + "Query": "replace into unsharded values (1, 2)" }, "TablesUsed": [ "main.unsharded" @@ -1825,8 +1758,7 @@ "Name": "main", "Sharded": false }, - "Query": "replace into unsharded select id from unsharded_auto", - "TableName": "unsharded" + "Query": "replace into unsharded select id from unsharded_auto" }, "TablesUsed": [ "main.unsharded", @@ -1850,8 +1782,7 @@ "Sharded": false }, "AutoIncrement": "select next :n /* INT64 */ values from seq:Values::(18446744073709551616)", - "Query": "replace into unsharded_auto(id, val) values (:__seq0, 'aa')", - "TableName": "unsharded_auto" + "Query": "replace into unsharded_auto(id, val) values (:__seq0, 'aa')" }, "TablesUsed": [ "main.unsharded_auto" @@ -1874,8 +1805,7 @@ "Sharded": false }, "AutoIncrement": "select next :n /* INT64 */ values from seq:Values::(1)", - "Query": "replace into unsharded_auto(id, val) values (:__seq0, 'aa')", - "TableName": "unsharded_auto" + "Query": "replace into unsharded_auto(id, val) values (:__seq0, 'aa')" }, "TablesUsed": [ "main.unsharded_auto" @@ -1898,8 +1828,7 @@ "Sharded": false }, "AutoIncrement": "select next :n /* INT64 */ values from seq:Values::(null)", - "Query": "replace into unsharded_auto(val, id) values ('aa', :__seq0)", - "TableName": "unsharded_auto" + "Query": "replace into unsharded_auto(val, id) values ('aa', :__seq0)" }, "TablesUsed": [ "main.unsharded_auto" @@ -1922,8 +1851,7 @@ "Sharded": false }, "AutoIncrement": "select next :n /* INT64 */ values from seq:Values::(1, null)", - "Query": "replace into unsharded_auto(id, val) values (:__seq0, 'aa'), (:__seq1, 'bb')", - "TableName": "unsharded_auto" + "Query": "replace into unsharded_auto(id, val) values (:__seq0, 'aa'), (:__seq1, 'bb')" }, "TablesUsed": [ "main.unsharded_auto" @@ -1952,7 +1880,6 @@ "Sharded": true }, "Query": "insert into multicolvin(column_a, column_b, column_c, kid) values (:_column_a_0, :_column_b_0, :_column_c_0, :_kid_0)", - "TableName": "multicolvin", "VindexValues": { "cola_map": "1", "colb_colc_map": "2, 3", @@ -1980,7 +1907,6 @@ "Sharded": true }, "Query": "insert into overlap_vindex(kid, column_a, column_b) values (:_kid_0, :_column_a_0, 3)", - "TableName": "overlap_vindex", "VindexValues": { "cola_kid_map": "2, 1", "kid_index": "1" @@ -2007,7 +1933,6 @@ "Sharded": true }, "Query": "insert into multicolvin(column_a, column_b, column_c, kid) values (:_column_a_0, :_column_b_0, :_column_c_0, :_kid_0), (:_column_a_1, :_column_b_1, :_column_c_1, :_kid_1)", - "TableName": "multicolvin", "VindexValues": { "cola_map": "1, 5", "colb_colc_map": "2, 6, 3, 7", @@ -2038,7 +1963,6 @@ "KsidVindex": "kid_index", "OwnedVindexQuery": "select kid, column_a, column_b, column_c from multicolvin where kid = 1 for update", "Query": "delete from multicolvin where kid = 1", - "Table": "multicolvin", "Values": [ "1" ], @@ -2071,7 +1995,6 @@ "KsidVindex": "kid_index", "OwnedVindexQuery": "select kid, column_a, column_b, column_c, column_b = 1 and column_c = 2 from multicolvin where kid = 1 for update", "Query": "update multicolvin set column_b = 1, column_c = 2 where kid = 1", - "Table": "multicolvin", "Values": [ "1" ], @@ -2105,7 +2028,6 @@ "KsidVindex": "kid_index", "OwnedVindexQuery": "select kid, column_a, column_b, column_c, column_a = 0, column_b = 1 and column_c = 2 from multicolvin where kid = 1 for update", "Query": "update multicolvin set column_a = 0, column_b = 1, column_c = 2 where kid = 1", - "Table": "multicolvin", "Values": [ "1" ], @@ -2131,8 +2053,7 @@ "Name": "user", "Sharded": true }, - "Query": "update user_extra set val = 1", - "Table": "user_extra" + "Query": "update user_extra set val = 1" }, "TablesUsed": [ "user.user_extra" @@ -2154,8 +2075,7 @@ "Name": "user", "Sharded": true }, - "Query": "update user_extra set val = 1", - "Table": "user_extra" + "Query": "update user_extra set val = 1" }, "TablesUsed": [ "user.user_extra" @@ -2178,8 +2098,7 @@ "Sharded": true }, "MultiShardAutocommit": true, - "Query": "update /*vt+ MULTI_SHARD_AUTOCOMMIT=1 */ user_extra set val = 1", - "Table": "user_extra" + "Query": "update /*vt+ MULTI_SHARD_AUTOCOMMIT=1 */ user_extra set val = 1" }, "TablesUsed": [ "user.user_extra" @@ -2202,8 +2121,7 @@ "Sharded": true }, "Query": "update /*vt+ QUERY_TIMEOUT_MS=1 */ user_extra set val = 1", - "QueryTimeout": 1, - "Table": "user_extra" + "QueryTimeout": 1 }, "TablesUsed": [ "user.user_extra" @@ -2225,8 +2143,7 @@ "Name": "user", "Sharded": true }, - "Query": "update user_extra set val = 1 where id between 1 and 2", - "Table": "user_extra" + "Query": "update user_extra set val = 1 where id between 1 and 2" }, "TablesUsed": [ "user.user_extra" @@ -2249,7 +2166,6 @@ "Sharded": true }, "Query": "update user_extra set val = 1 where user_id in ::__vals", - "Table": "user_extra", "Values": [ "(1, 2)" ], @@ -2275,8 +2191,7 @@ "Name": "user", "Sharded": true }, - "Query": "update user_extra set val = 1 where `name` = 'foo'", - "Table": "user_extra" + "Query": "update user_extra set val = 1 where `name` = 'foo'" }, "TablesUsed": [ "user.user_extra" @@ -2298,8 +2213,7 @@ "Name": "user", "Sharded": true }, - "Query": "update user_extra set val = 1 where id in (1, 2)", - "Table": "user_extra" + "Query": "update user_extra set val = 1 where id in (1, 2)" }, "TablesUsed": [ "user.user_extra" @@ -2321,8 +2235,7 @@ "Name": "user", "Sharded": true }, - "Query": "update user_extra set val = 1 where `name` = 'foo' or id = 1", - "Table": "user_extra" + "Query": "update user_extra set val = 1 where `name` = 'foo' or id = 1" }, "TablesUsed": [ "user.user_extra" @@ -2345,8 +2258,7 @@ "Sharded": true }, "FetchLastInsertID": true, - "Query": "update user_extra set col = last_insert_id(123)", - "Table": "user_extra" + "Query": "update user_extra set col = last_insert_id(123)" }, "TablesUsed": [ "user.user_extra" @@ -2368,8 +2280,7 @@ "Sharded": true }, "FetchLastInsertID": true, - "Query": "delete from user_extra where col = last_insert_id(123)", - "Table": "user_extra" + "Query": "delete from user_extra where col = last_insert_id(123)" }, "TablesUsed": [ "user.user_extra" @@ -2390,8 +2301,7 @@ "Name": "user", "Sharded": true }, - "Query": "delete from user_extra", - "Table": "user_extra" + "Query": "delete from user_extra" }, "TablesUsed": [ "user.user_extra" @@ -2413,8 +2323,7 @@ "Name": "user", "Sharded": true }, - "Query": "delete from user_extra", - "Table": "user_extra" + "Query": "delete from user_extra" }, "TablesUsed": [ "user.user_extra" @@ -2436,8 +2345,7 @@ "Name": "user", "Sharded": true }, - "Query": "delete from user_extra where user_id between 1 and 2", - "Table": "user_extra" + "Query": "delete from user_extra where user_id between 1 and 2" }, "TablesUsed": [ "user.user_extra" @@ -2459,8 +2367,7 @@ "Name": "user", "Sharded": true }, - "Query": "delete from user_extra where `name` = 'jose'", - "Table": "user_extra" + "Query": "delete from user_extra where `name` = 'jose'" }, "TablesUsed": [ "user.user_extra" @@ -2483,8 +2390,7 @@ "Sharded": true }, "MultiShardAutocommit": true, - "Query": "delete /*vt+ MULTI_SHARD_AUTOCOMMIT=1 */ from user_extra where `name` = 'jose'", - "Table": "user_extra" + "Query": "delete /*vt+ MULTI_SHARD_AUTOCOMMIT=1 */ from user_extra where `name` = 'jose'" }, "TablesUsed": [ "user.user_extra" @@ -2507,8 +2413,7 @@ "Sharded": true }, "Query": "delete /*vt+ QUERY_TIMEOUT_MS=1 */ from user_extra where `name` = 'jose'", - "QueryTimeout": 1, - "Table": "user_extra" + "QueryTimeout": 1 }, "TablesUsed": [ "user.user_extra" @@ -2531,7 +2436,6 @@ "Sharded": true }, "Query": "delete from user_extra where user_id in ::__vals", - "Table": "user_extra", "Values": [ "(1, 2)" ], @@ -2557,8 +2461,7 @@ "Name": "main", "Sharded": false }, - "Query": "update unsharded set col = (select id from unsharded_a where id = unsharded.col) where col = (select id from unsharded_b)", - "Table": "unsharded, unsharded_a, unsharded_b" + "Query": "update unsharded set col = (select id from unsharded_a where id = unsharded.col) where col = (select id from unsharded_b)" }, "TablesUsed": [ "main.unsharded", @@ -2582,8 +2485,7 @@ "Name": "main", "Sharded": false }, - "Query": "delete from unsharded where col = (select id from unsharded_a where id = unsharded.col)", - "Table": "unsharded, unsharded_a" + "Query": "delete from unsharded where col = (select id from unsharded_a where id = unsharded.col)" }, "TablesUsed": [ "main.unsharded", @@ -2613,7 +2515,6 @@ "KsidVindex": "user_index", "OwnedVindexQuery": "select Id, `Name`, Costly, `name` = null from `user` where id = 1 for update", "Query": "update `user` set `name` = null where id = 1", - "Table": "user", "Values": [ "1" ], @@ -2639,8 +2540,7 @@ "Name": "main", "Sharded": false }, - "Query": "insert into unsharded values (:__lastInsertId, 2)", - "TableName": "unsharded" + "Query": "insert into unsharded values (:__lastInsertId, 2)" }, "TablesUsed": [ "main.unsharded" @@ -2663,8 +2563,7 @@ "Sharded": false }, "FetchLastInsertID": true, - "Query": "insert into unsharded values (last_insert_id(789), 2)", - "TableName": "unsharded" + "Query": "insert into unsharded values (last_insert_id(789), 2)" }, "TablesUsed": [ "main.unsharded" @@ -2693,7 +2592,6 @@ "KsidVindex": "user_index", "OwnedVindexQuery": "select Id, `Name`, Costly, `name` = null from `user` where id in (1, 2, 3) for update", "Query": "update `user` set `name` = null where id in ::__vals", - "Table": "user", "Values": [ "(1, 2, 3)" ], @@ -2725,8 +2623,7 @@ "KsidLength": 1, "KsidVindex": "user_index", "OwnedVindexQuery": "select Id, `Name`, Costly, `name` = null from `user` for update", - "Query": "update `user` set `name` = null", - "Table": "user" + "Query": "update `user` set `name` = null" }, "TablesUsed": [ "user.user" @@ -2754,8 +2651,7 @@ "KsidLength": 1, "KsidVindex": "user_index", "OwnedVindexQuery": "select Id, `Name`, Costly, `name` = null from `user` where id + 1 = 2 for update", - "Query": "update `user` set `name` = null where id + 1 = 2", - "Table": "user" + "Query": "update `user` set `name` = null where id + 1 = 2" }, "TablesUsed": [ "user.user" @@ -2781,7 +2677,6 @@ "KsidVindex": "user_index", "OwnedVindexQuery": "select Id, `Name`, Costly from `user` where id in (1, 2, 3) for update", "Query": "delete from `user` where id in ::__vals", - "Table": "user", "Values": [ "(1, 2, 3)" ], @@ -2810,8 +2705,7 @@ "KsidLength": 1, "KsidVindex": "user_index", "OwnedVindexQuery": "select Id, `Name`, Costly from `user` where id + 1 = 2 for update", - "Query": "delete from `user` where id + 1 = 2", - "Table": "user" + "Query": "delete from `user` where id + 1 = 2" }, "TablesUsed": [ "user.user" @@ -2836,8 +2730,7 @@ "KsidLength": 1, "KsidVindex": "user_index", "OwnedVindexQuery": "select Id, `Name`, Costly from `user` for update", - "Query": "delete from `user`", - "Table": "user" + "Query": "delete from `user`" }, "TablesUsed": [ "user.user" @@ -2863,7 +2756,6 @@ "KsidVindex": "user_index", "OwnedVindexQuery": "select user_id, id from music where id = 1 for update", "Query": "delete from music where id = 1", - "Table": "music", "Values": [ "1" ], @@ -2889,8 +2781,7 @@ "Name": "user", "Sharded": true }, - "Query": "update `user` set val = 1", - "Table": "user" + "Query": "update `user` set val = 1" }, "TablesUsed": [ "user.user" @@ -2915,8 +2806,7 @@ "KsidLength": 1, "KsidVindex": "user_index", "OwnedVindexQuery": "select Id, `Name`, Costly from `user` for update", - "Query": "delete from `user`", - "Table": "user" + "Query": "delete from `user`" }, "TablesUsed": [ "user.user" @@ -2945,7 +2835,6 @@ "KsidVindex": "kid_index", "OwnedVindexQuery": "select kid, column_a, column_b, column_c, column_c = 2 from multicolvin where kid = 1 for update", "Query": "update multicolvin set column_c = 2 where kid = 1", - "Table": "multicolvin", "Values": [ "1" ], @@ -2978,7 +2867,6 @@ "KsidVindex": "user_index", "OwnedVindexQuery": "select Id, `Name`, Costly, `name` = _binary 'abc' from `user` where id = 1 for update", "Query": "update `user` set `name` = _binary 'abc' where id = 1", - "Table": "user", "Values": [ "1" ], @@ -3008,7 +2896,6 @@ "KsidVindex": "user_index", "OwnedVindexQuery": "select Id, `Name`, Costly from `user` where `name` = _binary 'abc' for update", "Query": "delete from `user` where `name` = _binary 'abc'", - "Table": "user", "Values": [ "_binary'abc'" ], @@ -3037,8 +2924,7 @@ "KsidLength": 1, "KsidVindex": "user_index", "OwnedVindexQuery": "select Id, `Name`, Costly from `user` for update", - "Query": "delete from `user`", - "Table": "user" + "Query": "delete from `user`" }, "TablesUsed": [ "user.user" @@ -3066,8 +2952,7 @@ "KsidLength": 1, "KsidVindex": "user_index", "OwnedVindexQuery": "select Id, `Name`, Costly, `name` = 'myname' from `user` for update", - "Query": "update `user` set `name` = 'myname'", - "Table": "user" + "Query": "update `user` set `name` = 'myname'" }, "TablesUsed": [ "user.user" @@ -3089,8 +2974,7 @@ "Name": "user", "Sharded": true }, - "Query": "update user_extra set val = 1", - "Table": "user_extra" + "Query": "update user_extra set val = 1" }, "TablesUsed": [ "user.user_extra" @@ -3115,8 +2999,7 @@ "KsidLength": 1, "KsidVindex": "user_index", "OwnedVindexQuery": "select Id, `Name`, Costly from `user` where `user`.id * `user`.col = `user`.foo for update", - "Query": "delete from `user` where `user`.id * `user`.col = `user`.foo", - "Table": "user" + "Query": "delete from `user` where `user`.id * `user`.col = `user`.foo" }, "TablesUsed": [ "user.user" @@ -3156,8 +3039,7 @@ "Name": "main", "Sharded": false }, - "Query": "insert into user_privacy_consents(user_id, accepted_at) select user_id, accepted_at from (select 1 as user_id, 1629194864 as accepted_at from dual) as tmp where not exists (select 1 from user_privacy_consents where user_id = 1)", - "TableName": "user_privacy_consents" + "Query": "insert into user_privacy_consents(user_id, accepted_at) select user_id, accepted_at from (select 1 as user_id, 1629194864 as accepted_at from dual) as tmp where not exists (select 1 from user_privacy_consents where user_id = 1)" }, "TablesUsed": [ "main.dual", @@ -3183,8 +3065,7 @@ "KsidLength": 1, "KsidVindex": "xxhash", "OwnedVindexQuery": "select c1, c2, c3 from t1 where c2 = 20 for update", - "Query": "delete from t1 where c2 = 20", - "Table": "t1" + "Query": "delete from t1 where c2 = 20" }, "TablesUsed": [ "zlookup_unique.t1" @@ -3212,8 +3093,7 @@ "KsidLength": 1, "KsidVindex": "xxhash", "OwnedVindexQuery": "select c1, c2, c3, c2 = 1 from t1 where c2 = 20 for update", - "Query": "update t1 set c2 = 1 where c2 = 20", - "Table": "t1" + "Query": "update t1 set c2 = 1 where c2 = 20" }, "TablesUsed": [ "zlookup_unique.t1" @@ -3239,7 +3119,6 @@ "KsidVindex": "xxhash", "OwnedVindexQuery": "select c1, c2, c3 from t1 where c2 = 10 and c3 = 20 for update", "Query": "delete from t1 where c2 = 10 and c3 = 20", - "Table": "t1", "Values": [ "20" ], @@ -3272,7 +3151,6 @@ "KsidVindex": "xxhash", "OwnedVindexQuery": "select c1, c2, c3, c2 = 1 from t1 where c2 = 10 and c3 = 20 for update", "Query": "update t1 set c2 = 1 where c2 = 10 and c3 = 20", - "Table": "t1", "Values": [ "20" ], @@ -3302,7 +3180,6 @@ "KsidVindex": "xxhash", "OwnedVindexQuery": "select c1, c2, c3 from t1 where c2 = 10 and c3 in (20, 21) for update", "Query": "delete from t1 where c2 = 10 and c3 in ::__vals", - "Table": "t1", "Values": [ "(20, 21)" ], @@ -3335,7 +3212,6 @@ "KsidVindex": "xxhash", "OwnedVindexQuery": "select c1, c2, c3, c2 = 1 from t1 where c2 = 10 and c3 in (20, 21) for update", "Query": "update t1 set c2 = 1 where c2 = 10 and c3 in ::__vals", - "Table": "t1", "Values": [ "(20, 21)" ], @@ -3367,8 +3243,7 @@ "KsidLength": 1, "KsidVindex": "user_index", "OwnedVindexQuery": "select Id, `Name`, Costly, u.`name` = 'john' from `user` as u where u.col > 20 for update", - "Query": "update `user` as u set u.`name` = 'john' where u.col > 20", - "Table": "user" + "Query": "update `user` as u set u.`name` = 'john' where u.col > 20" }, "TablesUsed": [ "user.user" @@ -3393,8 +3268,7 @@ "KsidLength": 1, "KsidVindex": "user_index", "OwnedVindexQuery": "select Id, `Name`, Costly from `user` as u where u.col > 20 for update", - "Query": "delete from `user` as u where u.col > 20", - "Table": "user" + "Query": "delete from `user` as u where u.col > 20" }, "TablesUsed": [ "user.user" @@ -3417,7 +3291,6 @@ "Sharded": true }, "Query": "update multicol_tbl set x = 1 where cola = 1 and colb = 2", - "Table": "multicol_tbl", "Values": [ "1", "2" @@ -3445,7 +3318,6 @@ "Sharded": true }, "Query": "update multicol_tbl set x = 1 where colb = 2 and cola = 1", - "Table": "multicol_tbl", "Values": [ "1", "2" @@ -3473,7 +3345,6 @@ "Sharded": true }, "Query": "update multicol_tbl set x = 1 where colb in ::__vals1 and cola = 1", - "Table": "multicol_tbl", "Values": [ "1", "(1, 2)" @@ -3501,7 +3372,6 @@ "Sharded": true }, "Query": "update multicol_tbl set x = 1 where colb in ::__vals1 and cola in ::__vals0", - "Table": "multicol_tbl", "Values": [ "(3, 4)", "(1, 2)" @@ -3532,7 +3402,6 @@ "KsidVindex": "multicolIdx", "OwnedVindexQuery": "select cola, colb, colc, `name` from multicol_tbl where cola = 1 and colb = 2 for update", "Query": "delete from multicol_tbl where cola = 1 and colb = 2", - "Table": "multicol_tbl", "Values": [ "1", "2" @@ -3563,7 +3432,6 @@ "KsidVindex": "multicolIdx", "OwnedVindexQuery": "select cola, colb, colc, `name` from multicol_tbl where colb = 2 and cola = 1 for update", "Query": "delete from multicol_tbl where colb = 2 and cola = 1", - "Table": "multicol_tbl", "Values": [ "1", "2" @@ -3594,7 +3462,6 @@ "KsidVindex": "multicolIdx", "OwnedVindexQuery": "select cola, colb, colc, `name` from multicol_tbl where colb in (1, 2) and cola = 1 for update", "Query": "delete from multicol_tbl where colb in ::__vals1 and cola = 1", - "Table": "multicol_tbl", "Values": [ "1", "(1, 2)" @@ -3625,7 +3492,6 @@ "KsidVindex": "multicolIdx", "OwnedVindexQuery": "select cola, colb, colc, `name` from multicol_tbl where colb in (1, 2) and cola in (3, 4) for update", "Query": "delete from multicol_tbl where colb in ::__vals1 and cola in ::__vals0", - "Table": "multicol_tbl", "Values": [ "(3, 4)", "(1, 2)" @@ -3659,7 +3525,6 @@ "KsidVindex": "multicolIdx", "OwnedVindexQuery": "select cola, colb, colc, `name`, colc = 1 from multicol_tbl where cola = 1 and colb = 2 for update", "Query": "update multicol_tbl set colc = 1 where cola = 1 and colb = 2", - "Table": "multicol_tbl", "Values": [ "1", "2" @@ -3687,7 +3552,6 @@ "Sharded": true }, "Query": "update multicol_tbl set x = 42 where `name` = 'foo'", - "Table": "multicol_tbl", "Values": [ "'foo'" ], @@ -3714,7 +3578,6 @@ "Sharded": true }, "Query": "update multicol_tbl set x = 42 where cola = 1", - "Table": "multicol_tbl", "Values": [ "1" ], @@ -3747,7 +3610,6 @@ "KsidVindex": "multicolIdx", "OwnedVindexQuery": "select cola, colb, colc, `name`, `name` = 'bar' from multicol_tbl where cola = 1 for update", "Query": "update multicol_tbl set `name` = 'bar' where cola = 1", - "Table": "multicol_tbl", "Values": [ "1" ], @@ -3780,7 +3642,6 @@ "KsidVindex": "multicolIdx", "OwnedVindexQuery": "select cola, colb, colc, `name`, `name` = 'bar' from multicol_tbl where cola in (1, 2) for update", "Query": "update multicol_tbl set `name` = 'bar' where cola in ::__vals0", - "Table": "multicol_tbl", "Values": [ "(1, 2)" ], @@ -3807,7 +3668,6 @@ "Sharded": true }, "Query": "update multicol_tbl set x = 1 where `name` = 'foo' and cola = 2", - "Table": "multicol_tbl", "Values": [ "'foo'" ], @@ -3837,7 +3697,6 @@ "KsidVindex": "multicolIdx", "OwnedVindexQuery": "select cola, colb, colc, `name` from multicol_tbl where `name` = 'foo' for update", "Query": "delete from multicol_tbl where `name` = 'foo'", - "Table": "multicol_tbl", "Values": [ "'foo'" ], @@ -3867,7 +3726,6 @@ "KsidVindex": "multicolIdx", "OwnedVindexQuery": "select cola, colb, colc, `name` from multicol_tbl where cola = 1 for update", "Query": "delete from multicol_tbl where cola = 1", - "Table": "multicol_tbl", "Values": [ "1" ], @@ -3897,7 +3755,6 @@ "KsidVindex": "multicolIdx", "OwnedVindexQuery": "select cola, colb, colc, `name` from multicol_tbl where cola in (1, 2) for update", "Query": "delete from multicol_tbl where cola in ::__vals0", - "Table": "multicol_tbl", "Values": [ "(1, 2)" ], @@ -3927,7 +3784,6 @@ "KsidVindex": "multicolIdx", "OwnedVindexQuery": "select cola, colb, colc, `name` from multicol_tbl where `name` = 'foo' and cola = 2 for update", "Query": "delete from multicol_tbl where `name` = 'foo' and cola = 2", - "Table": "multicol_tbl", "Values": [ "'foo'" ], @@ -3953,7 +3809,6 @@ "Name": "user", "Sharded": true }, - "TableName": "music", "VindexOffsetFromSelect": { "music_user_map": "[0]", "user_index": "[1]" @@ -3967,8 +3822,7 @@ "Sharded": true }, "FieldQuery": "select * from `user` where 1 != 1", - "Query": "select * from `user` lock in share mode", - "Table": "`user`" + "Query": "select * from `user` lock in share mode" } ] }, @@ -4012,7 +3866,6 @@ "Sharded": true }, "AutoIncrement": "select next :n /* INT64 */ values from seq:Offset(1)", - "TableName": "user_extra", "VindexOffsetFromSelect": { "user_index": "[0]" }, @@ -4025,8 +3878,7 @@ "Sharded": true }, "FieldQuery": "select id from `user` where 1 != 1", - "Query": "select id from `user` lock in share mode", - "Table": "`user`" + "Query": "select id from `user` lock in share mode" } ] }, @@ -4052,7 +3904,6 @@ "Sharded": true }, "AutoIncrement": "select next :n /* INT64 */ values from seq:Offset(2)", - "TableName": "user_extra", "VindexOffsetFromSelect": { "user_index": "[1]" }, @@ -4065,8 +3916,7 @@ "Sharded": true }, "FieldQuery": "select null, id from `user` where 1 != 1", - "Query": "select null, id from `user` lock in share mode", - "Table": "`user`" + "Query": "select null, id from `user` lock in share mode" } ] }, @@ -4092,7 +3942,6 @@ "Sharded": true }, "AutoIncrement": "select next :n /* INT64 */ values from seq:Offset(0)", - "TableName": "user", "VindexOffsetFromSelect": { "costly_map": "[-1]", "name_user_map": "[-1]", @@ -4107,8 +3956,7 @@ "Sharded": false }, "FieldQuery": "select 1 from dual where 1 != 1", - "Query": "select 1 from dual lock in share mode", - "Table": "dual" + "Query": "select 1 from dual lock in share mode" } ] }, @@ -4134,7 +3982,6 @@ "Sharded": true }, "AutoIncrement": "select next :n /* INT64 */ values from seq:Offset(1)", - "TableName": "user", "VindexOffsetFromSelect": { "costly_map": "[-1]", "name_user_map": "[-1]", @@ -4149,8 +3996,7 @@ "Sharded": false }, "FieldQuery": "select 1 from dual where 1 != 1", - "Query": "select 1 from dual lock in share mode", - "Table": "dual" + "Query": "select 1 from dual lock in share mode" } ] }, @@ -4182,7 +4028,6 @@ "Sharded": true }, "AutoIncrement": "select next :n /* INT64 */ values from seq:Offset(2)", - "TableName": "user_extra", "VindexOffsetFromSelect": { "user_index": "[0]" }, @@ -4195,8 +4040,7 @@ "Sharded": true }, "FieldQuery": "select col1, col2 from `user` where 1 != 1", - "Query": "select col1, col2 from `user` lock in share mode", - "Table": "`user`" + "Query": "select col1, col2 from `user` lock in share mode" } ] }, @@ -4221,8 +4065,7 @@ "Name": "main", "Sharded": false }, - "Query": "insert into unsharded(col) select col from unsharded_auto", - "TableName": "unsharded" + "Query": "insert into unsharded(col) select col from unsharded_auto" }, "TablesUsed": [ "main.unsharded", @@ -4246,7 +4089,6 @@ "Sharded": true }, "AutoIncrement": "select next :n /* INT64 */ values from seq:Offset(2)", - "TableName": "user_extra", "VindexOffsetFromSelect": { "user_index": "[0]" }, @@ -4259,8 +4101,7 @@ "Sharded": true }, "FieldQuery": "select col1, col2 from t1 where 1 != 1", - "Query": "select col1, col2 from t1 lock in share mode", - "Table": "t1" + "Query": "select col1, col2 from t1 lock in share mode" } ] }, @@ -4286,7 +4127,6 @@ "Sharded": true }, "AutoIncrement": "select next :n /* INT64 */ values from seq:Offset(2)", - "TableName": "user_extra", "VindexOffsetFromSelect": { "user_index": "[0]" }, @@ -4299,8 +4139,7 @@ "Sharded": false }, "FieldQuery": "select col1, col2 from unsharded_tab where 1 != 1", - "Query": "select col1, col2 from unsharded_tab lock in share mode", - "Table": "unsharded_tab" + "Query": "select col1, col2 from unsharded_tab lock in share mode" } ] }, @@ -4325,7 +4164,6 @@ "Name": "main", "Sharded": false }, - "TableName": "unsharded", "Inputs": [ { "OperatorType": "Route", @@ -4335,8 +4173,7 @@ "Sharded": false }, "FieldQuery": "select col from unsharded_tab where 1 != 1", - "Query": "select col from unsharded_tab lock in share mode", - "Table": "unsharded_tab" + "Query": "select col from unsharded_tab lock in share mode" } ] }, @@ -4361,7 +4198,6 @@ "Name": "main", "Sharded": false }, - "TableName": "unsharded", "Inputs": [ { "OperatorType": "Route", @@ -4371,8 +4207,7 @@ "Sharded": true }, "FieldQuery": "select col from t1 where 1 != 1", - "Query": "select col from t1 lock in share mode", - "Table": "t1" + "Query": "select col from t1 lock in share mode" } ] }, @@ -4406,8 +4241,7 @@ "Sharded": false }, "FieldQuery": "select id from unsharded where 1 != 1", - "Query": "select id from unsharded lock in share mode", - "Table": "unsharded" + "Query": "select id from unsharded lock in share mode" }, { "InputName": "Outer", @@ -4417,8 +4251,7 @@ "Name": "user", "Sharded": true }, - "Query": "update `user` set col = :__sq1", - "Table": "user" + "Query": "update `user` set col = :__sq1" } ] }, @@ -4452,8 +4285,7 @@ "Sharded": true }, "FieldQuery": "select id from `user` where 1 != 1", - "Query": "select id from `user` lock in share mode", - "Table": "`user`" + "Query": "select id from `user` lock in share mode" }, { "InputName": "Outer", @@ -4463,8 +4295,7 @@ "Name": "main", "Sharded": false }, - "Query": "update unsharded set col = :__sq1", - "Table": "unsharded" + "Query": "update unsharded set col = :__sq1" } ] }, @@ -4497,7 +4328,6 @@ "JoinVars": { "unsharded_id": 0 }, - "TableName": "unsharded_`user`", "Inputs": [ { "OperatorType": "Route", @@ -4507,8 +4337,7 @@ "Sharded": false }, "FieldQuery": "select unsharded.id from unsharded where 1 != 1", - "Query": "select unsharded.id from unsharded lock in share mode", - "Table": "unsharded" + "Query": "select unsharded.id from unsharded lock in share mode" }, { "OperatorType": "Route", @@ -4519,7 +4348,6 @@ }, "FieldQuery": "select id from `user` where 1 != 1", "Query": "select id from `user` where `user`.id = :unsharded_id lock in share mode", - "Table": "`user`", "Values": [ ":unsharded_id" ], @@ -4535,8 +4363,7 @@ "Name": "main", "Sharded": false }, - "Query": "update unsharded set col = :__sq1", - "Table": "unsharded" + "Query": "update unsharded set col = :__sq1" } ] }, @@ -4562,7 +4389,6 @@ "Sharded": true }, "Query": "update `user` set col = (select count(*) from user_extra where user_extra.user_id = 5) where id = 5", - "Table": "user", "Values": [ "5" ], @@ -4590,7 +4416,6 @@ "Sharded": true }, "Query": "update `user` set col = (select count(*) from user_extra where user_extra.user_id = `user`.id) where id = 5", - "Table": "user", "Values": [ "5" ], @@ -4617,8 +4442,7 @@ "Name": "user", "Sharded": true }, - "Query": "update `user` set col = (select count(*) from user_extra where user_extra.user_id = `user`.id) where id > 5", - "Table": "user" + "Query": "update `user` set col = (select count(*) from user_extra where user_extra.user_id = `user`.id) where id > 5" }, "TablesUsed": [ "user.user", @@ -4642,7 +4466,6 @@ "Sharded": true }, "Query": "insert into authoritative(user_id) values (:_user_id_0)", - "TableName": "authoritative", "VindexValues": { "user_index": "null" } @@ -4680,8 +4503,7 @@ "KsidLength": 1, "KsidVindex": "user_index", "OwnedVindexQuery": "select Id, `Name`, Costly from `user` for update", - "Query": "delete from `user`", - "Table": "user" + "Query": "delete from `user`" } ] }, @@ -4712,8 +4534,7 @@ "KsidLength": 1, "KsidVindex": "user_index", "OwnedVindexQuery": "select Id, `Name`, Costly from `user` for update", - "Query": "delete from `user`", - "Table": "user" + "Query": "delete from `user`" } ] }, @@ -4737,8 +4558,7 @@ "Name": "main", "Sharded": false }, - "Query": "delete foo from unsharded as foo join (select id from unsharded as a join unsharded_b as b on a.user_id = b.user_id) as keepers on foo.id = keepers.id where keepers.id is null and foo.col is not null and foo.col < 1000", - "Table": "unsharded, unsharded_b" + "Query": "delete foo from unsharded as foo join (select id from unsharded as a join unsharded_b as b on a.user_id = b.user_id) as keepers on foo.id = keepers.id where keepers.id is null and foo.col is not null and foo.col < 1000" }, "TablesUsed": [ "main.unsharded", @@ -4762,7 +4582,6 @@ "Sharded": true }, "Query": "update `user` set col = 1 where (`name`, col) in (('aa', 'bb'), ('cc', 'dd'))", - "Table": "user", "Values": [ "('aa', 'cc')" ], @@ -4792,7 +4611,6 @@ "KsidVindex": "user_index", "OwnedVindexQuery": "select Id, `Name`, Costly from `user` where (`name`, col) in (('aa', 'bb'), ('cc', 'dd')) for update", "Query": "delete from `user` where (`name`, col) in (('aa', 'bb'), ('cc', 'dd'))", - "Table": "user", "Values": [ "('aa', 'cc')" ], @@ -4818,8 +4636,7 @@ "Name": "user", "Sharded": true }, - "Query": "insert into ref(col) values (1)", - "TableName": "ref" + "Query": "insert into ref(col) values (1)" }, "TablesUsed": [ "user.ref" @@ -4841,8 +4658,7 @@ "Name": "main", "Sharded": false }, - "Query": "update m1 set foo = last_insert_id(foo + 1) where id = 12345", - "Table": "m1" + "Query": "update m1 set foo = last_insert_id(foo + 1) where id = 12345" }, "TablesUsed": [ "main.m1" @@ -4865,8 +4681,7 @@ "Sharded": false }, "Query": "update /*vt+ QUERY_TIMEOUT_MS=1 */ unsharded set val = 1", - "QueryTimeout": 1, - "Table": "unsharded" + "QueryTimeout": 1 }, "TablesUsed": [ "main.unsharded" @@ -4889,8 +4704,7 @@ "Sharded": false }, "Query": "insert /*vt+ QUERY_TIMEOUT_MS=1 */ into unsharded values ()", - "QueryTimeout": 1, - "TableName": "unsharded" + "QueryTimeout": 1 }, "TablesUsed": [ "main.unsharded" @@ -4913,7 +4727,6 @@ "Sharded": true }, "InputAsNonStreaming": true, - "TableName": "music", "VindexOffsetFromSelect": { "music_user_map": "[0]", "user_index": "[1]" @@ -4928,7 +4741,6 @@ }, "FieldQuery": "select id, user_id from music where 1 != 1", "Query": "select id, user_id from music where user_id = 1 lock in share mode", - "Table": "music", "Values": [ "1" ], @@ -4958,7 +4770,6 @@ }, "AutoIncrement": "select next :n /* INT64 */ values from seq:Values::(null, null, null)", "Query": "insert into mixed_tbl(shard_key, lkp_key) values (:_shard_key_0, :_lkp_key_0), (:_shard_key_1, :_lkp_key_1), (:_shard_key_2, :_lkp_key_2)", - "TableName": "mixed_tbl", "VindexValues": { "lkp_shard_map": ":__seq0, :__seq1, :__seq2", "shard_index": "1, 4, 9" @@ -4986,7 +4797,6 @@ }, "AutoIncrement": "select next :n /* INT64 */ values from seq:Values::(1, null, 27)", "Query": "insert into mixed_tbl(shard_key, lkp_key) values (:_shard_key_0, :_lkp_key_0), (:_shard_key_1, :_lkp_key_1), (:_shard_key_2, :_lkp_key_2)", - "TableName": "mixed_tbl", "VindexValues": { "lkp_shard_map": ":__seq0, :__seq1, :__seq2", "shard_index": "1, 4, 9" @@ -5013,7 +4823,6 @@ "Sharded": true }, "AutoIncrement": "select next :n /* INT64 */ values from seq:Offset(1)", - "TableName": "mixed_tbl", "VindexOffsetFromSelect": { "lkp_shard_map": "[1]", "shard_index": "[0]" @@ -5028,7 +4837,6 @@ }, "FieldQuery": "select foo from `user` where 1 != 1", "Query": "select foo from `user` where id = 1 lock in share mode", - "Table": "`user`", "Values": [ "1" ], @@ -5058,7 +4866,6 @@ "Sharded": true }, "AutoIncrement": "select next :n /* INT64 */ values from seq:Offset(1)", - "TableName": "mixed_tbl", "VindexOffsetFromSelect": { "lkp_shard_map": "[1]", "shard_index": "[0]" @@ -5073,7 +4880,6 @@ }, "FieldQuery": "select foo, bar from `user` where 1 != 1", "Query": "select foo, bar from `user` where id = 1 lock in share mode", - "Table": "`user`", "Values": [ "1" ], @@ -5110,7 +4916,6 @@ }, "AutoIncrement": "select next :n /* INT64 */ values from seq:Offset(0)", "InputAsNonStreaming": true, - "TableName": "user", "VindexOffsetFromSelect": { "costly_map": "[-1]", "name_user_map": "[-1]", @@ -5125,8 +4930,7 @@ "Sharded": true }, "FieldQuery": "select id from `user` where 1 != 1", - "Query": "select id from `user` lock in share mode", - "Table": "`user`" + "Query": "select id from `user` lock in share mode" } ] }, @@ -5182,7 +4986,6 @@ }, "InsertIgnore": true, "Query": "insert into music(id, user_id, col) values (:_id_0, :_user_id_0, 3) on duplicate key update music.col = 5", - "TableName": "music", "VindexValues": { "music_user_map": "1", "user_index": "2" @@ -5208,8 +5011,7 @@ "Name": "main", "Sharded": false }, - "Query": "delete from source_of_ref where col = 1", - "Table": "source_of_ref" + "Query": "delete from source_of_ref where col = 1" }, "TablesUsed": [ "main.source_of_ref" @@ -5231,8 +5033,7 @@ "Name": "user", "Sharded": true }, - "Query": "delete from ref", - "Table": "ref" + "Query": "delete from ref" }, "TablesUsed": [ "user.ref" @@ -5257,8 +5058,7 @@ "KsidLength": 1, "KsidVindex": "user_index", "OwnedVindexQuery": "select Id, `Name`, Costly from `user` limit 20 for update", - "Query": "delete from `user` limit 20", - "Table": "user" + "Query": "delete from `user` limit 20" }, "TablesUsed": [ "user.user" @@ -5283,8 +5083,7 @@ "KsidLength": 1, "KsidVindex": "user_index", "OwnedVindexQuery": "select u.Id, u.`Name`, u.Costly from `user` as u, ref_with_source as r where u.col = r.col for update", - "Query": "delete u from `user` as u, ref_with_source as r where u.col = r.col", - "Table": "user" + "Query": "delete u from `user` as u, ref_with_source as r where u.col = r.col" }, "TablesUsed": [ "user.ref_with_source", @@ -5310,8 +5109,7 @@ "KsidLength": 1, "KsidVindex": "user_index", "OwnedVindexQuery": "select u.Id, u.`Name`, u.Costly from `user` as u, music as m where u.id = m.user_id for update", - "Query": "delete u from `user` as u, music as m where u.id = m.user_id", - "Table": "user" + "Query": "delete u from `user` as u, music as m where u.id = m.user_id" }, "TablesUsed": [ "user.music", @@ -5340,7 +5138,6 @@ "JoinVars": { "user_extra_id": 0 }, - "TableName": "user_extra_`user`", "Inputs": [ { "OperatorType": "Route", @@ -5350,8 +5147,7 @@ "Sharded": true }, "FieldQuery": "select user_extra.id from user_extra where 1 != 1", - "Query": "select user_extra.id from user_extra", - "Table": "user_extra" + "Query": "select user_extra.id from user_extra" }, { "OperatorType": "Route", @@ -5362,7 +5158,6 @@ }, "FieldQuery": "select `user`.id from `user` where 1 != 1", "Query": "select `user`.id from `user` where `user`.`name` = 'foo' and `user`.id = :user_extra_id", - "Table": "`user`", "Values": [ ":user_extra_id" ], @@ -5381,7 +5176,6 @@ "KsidVindex": "user_index", "OwnedVindexQuery": "select `user`.Id, `user`.`Name`, `user`.Costly from `user` where `user`.id in ::dml_vals for update", "Query": "delete from `user` where `user`.id in ::dml_vals", - "Table": "user", "Values": [ "::dml_vals" ], @@ -5416,7 +5210,6 @@ "JoinVars": { "u_col": 1 }, - "TableName": "`user`_music", "Inputs": [ { "OperatorType": "Route", @@ -5426,8 +5219,7 @@ "Sharded": true }, "FieldQuery": "select u.id, u.col from `user` as u where 1 != 1", - "Query": "select u.id, u.col from `user` as u", - "Table": "`user`" + "Query": "select u.id, u.col from `user` as u" }, { "OperatorType": "Route", @@ -5437,8 +5229,7 @@ "Sharded": true }, "FieldQuery": "select 1 from music as m where 1 != 1", - "Query": "select 1 from music as m where m.col = :u_col /* INT16 */", - "Table": "music" + "Query": "select 1 from music as m where m.col = :u_col /* INT16 */" } ] }, @@ -5453,7 +5244,6 @@ "KsidVindex": "user_index", "OwnedVindexQuery": "select u.Id, u.`Name`, u.Costly from `user` as u where u.id in ::dml_vals for update", "Query": "delete from `user` as u where u.id in ::dml_vals", - "Table": "user", "Values": [ "::dml_vals" ], @@ -5488,7 +5278,6 @@ "JoinVars": { "m_col": 0 }, - "TableName": "music_`user`", "Inputs": [ { "OperatorType": "Route", @@ -5498,8 +5287,7 @@ "Sharded": true }, "FieldQuery": "select m.col from music as m where 1 != 1", - "Query": "select m.col from music as m where m.foo = 42", - "Table": "music" + "Query": "select m.col from music as m where m.foo = 42" }, { "OperatorType": "Route", @@ -5509,8 +5297,7 @@ "Sharded": true }, "FieldQuery": "select u.id from `user` as u where 1 != 1", - "Query": "select u.id from `user` as u where u.col = :m_col", - "Table": "`user`" + "Query": "select u.id from `user` as u where u.col = :m_col" } ] }, @@ -5525,7 +5312,6 @@ "KsidVindex": "user_index", "OwnedVindexQuery": "select u.Id, u.`Name`, u.Costly from `user` as u where u.id in ::dml_vals for update", "Query": "delete from `user` as u where u.id in ::dml_vals", - "Table": "user", "Values": [ "::dml_vals" ], @@ -5557,8 +5343,7 @@ "KsidLength": 1, "KsidVindex": "user_index", "OwnedVindexQuery": "select u.Id, u.`Name`, u.Costly from `user` as u, music as m where m.foo = 42 and u.id = m.user_id for update", - "Query": "delete u from `user` as u, music as m where m.foo = 42 and u.id = m.user_id", - "Table": "user" + "Query": "delete u from `user` as u, music as m where m.foo = 42 and u.id = m.user_id" }, "TablesUsed": [ "user.music", @@ -5587,7 +5372,6 @@ "JoinVars": { "u_col": 1 }, - "TableName": "`user`_music, user_extra", "Inputs": [ { "OperatorType": "Route", @@ -5597,8 +5381,7 @@ "Sharded": true }, "FieldQuery": "select u.id, u.col from `user` as u where 1 != 1", - "Query": "select u.id, u.col from `user` as u where u.col = 30", - "Table": "`user`" + "Query": "select u.id, u.col from `user` as u where u.col = 30" }, { "OperatorType": "Route", @@ -5608,8 +5391,7 @@ "Sharded": true }, "FieldQuery": "select 1 from music as m, user_extra as ue where 1 != 1", - "Query": "select 1 from music as m, user_extra as ue where m.bar = 40 and m.col = :u_col /* INT16 */ and ue.foo = 20 and m.user_id = ue.user_id", - "Table": "music, user_extra" + "Query": "select 1 from music as m, user_extra as ue where m.bar = 40 and m.col = :u_col /* INT16 */ and ue.foo = 20 and m.user_id = ue.user_id" } ] }, @@ -5624,7 +5406,6 @@ "KsidVindex": "user_index", "OwnedVindexQuery": "select u.Id, u.`Name`, u.Costly from `user` as u where u.id in ::dml_vals for update", "Query": "delete from `user` as u where u.id in ::dml_vals", - "Table": "user", "Values": [ "::dml_vals" ], @@ -5660,7 +5441,6 @@ "JoinVars": { "u_col": 0 }, - "TableName": "`user`_music, user_extra", "Inputs": [ { "OperatorType": "Route", @@ -5670,8 +5450,7 @@ "Sharded": true }, "FieldQuery": "select u.col from `user` as u where 1 != 1", - "Query": "select u.col from `user` as u where u.col = 30", - "Table": "`user`" + "Query": "select u.col from `user` as u where u.col = 30" }, { "OperatorType": "Route", @@ -5681,8 +5460,7 @@ "Sharded": true }, "FieldQuery": "select m.id from music as m, user_extra as ue where 1 != 1", - "Query": "select m.id from music as m, user_extra as ue where m.bar = 40 and m.col = :u_col /* INT16 */ and ue.foo = 20 and m.user_id = ue.user_id", - "Table": "music, user_extra" + "Query": "select m.id from music as m, user_extra as ue where m.bar = 40 and m.col = :u_col /* INT16 */ and ue.foo = 20 and m.user_id = ue.user_id" } ] }, @@ -5697,7 +5475,6 @@ "KsidVindex": "user_index", "OwnedVindexQuery": "select m.user_id, m.id from music as m where m.id in ::dml_vals for update", "Query": "delete from music as m where m.id in ::dml_vals", - "Table": "music", "Values": [ "::dml_vals" ], @@ -5738,8 +5515,7 @@ "Sharded": true }, "FieldQuery": "select `user`.id from `user` where 1 != 1", - "Query": "select `user`.id from `user` limit :__upper_limit", - "Table": "`user`" + "Query": "select `user`.id from `user` limit :__upper_limit" } ] }, @@ -5754,7 +5530,6 @@ "KsidVindex": "user_index", "OwnedVindexQuery": "select Id, `Name`, Costly from `user` where `user`.id in ::dml_vals for update", "Query": "delete from `user` where `user`.id in ::dml_vals", - "Table": "user", "Values": [ "::dml_vals" ], @@ -5794,8 +5569,7 @@ }, "FieldQuery": "select `user`.id, `name`, weight_string(`name`), col from `user` where 1 != 1", "OrderBy": "(1|2) ASC, 3 ASC", - "Query": "select `user`.id, `name`, weight_string(`name`), col from `user` order by `name` asc, col asc limit :__upper_limit", - "Table": "`user`" + "Query": "select `user`.id, `name`, weight_string(`name`), col from `user` order by `name` asc, col asc limit :__upper_limit" } ] }, @@ -5810,7 +5584,6 @@ "KsidVindex": "user_index", "OwnedVindexQuery": "select Id, `Name`, Costly from `user` where `user`.id in ::dml_vals for update", "Query": "delete from `user` where `user`.id in ::dml_vals", - "Table": "user", "Values": [ "::dml_vals" ], @@ -5849,8 +5622,7 @@ "Sharded": true }, "FieldQuery": "select `user`.id from `user` where 1 != 1", - "Query": "select `user`.id from `user` where `name` = 'foo' or id = 1 limit :__upper_limit lock in share mode", - "Table": "`user`" + "Query": "select `user`.id from `user` where `name` = 'foo' or id = 1 limit :__upper_limit lock in share mode" } ] }, @@ -5862,7 +5634,6 @@ "Sharded": true }, "Query": "update `user` set val = 1 where `user`.id in ::dml_vals", - "Table": "user", "Values": [ "::dml_vals" ], @@ -5901,8 +5672,7 @@ "Sharded": true }, "FieldQuery": "select `user`.id from `user` where 1 != 1", - "Query": "select `user`.id from `user` where id > 10 limit :__upper_limit lock in share mode", - "Table": "`user`" + "Query": "select `user`.id from `user` where id > 10 limit :__upper_limit lock in share mode" } ] }, @@ -5920,7 +5690,6 @@ "KsidVindex": "user_index", "OwnedVindexQuery": "select Id, `Name`, Costly, `name` = 'abc' from `user` where `user`.id in ::dml_vals for update", "Query": "update `user` set `name` = 'abc' where `user`.id in ::dml_vals", - "Table": "user", "Values": [ "::dml_vals" ], @@ -5954,7 +5723,6 @@ "JoinVars": { "ue_id": 0 }, - "TableName": "user_extra_`user`", "Inputs": [ { "OperatorType": "Route", @@ -5964,8 +5732,7 @@ "Sharded": true }, "FieldQuery": "select ue.id from user_extra as ue where 1 != 1", - "Query": "select ue.id from user_extra as ue lock in share mode", - "Table": "user_extra" + "Query": "select ue.id from user_extra as ue lock in share mode" }, { "OperatorType": "Route", @@ -5976,7 +5743,6 @@ }, "FieldQuery": "select u.id from `user` as u where 1 != 1", "Query": "select u.id from `user` as u where u.id = :ue_id lock in share mode", - "Table": "`user`", "Values": [ ":ue_id" ], @@ -5998,7 +5764,6 @@ "KsidVindex": "user_index", "OwnedVindexQuery": "select Id, `Name`, Costly, u.`name` = 'foo' from `user` as u where u.id in ::dml_vals for update", "Query": "update `user` as u set u.`name` = 'foo' where u.id in ::dml_vals", - "Table": "user", "Values": [ "::dml_vals" ], @@ -6033,7 +5798,6 @@ "JoinVars": { "user_extra_id": 0 }, - "TableName": "user_extra_`user`", "Inputs": [ { "OperatorType": "Route", @@ -6043,8 +5807,7 @@ "Sharded": true }, "FieldQuery": "select user_extra.id from user_extra where 1 != 1", - "Query": "select user_extra.id from user_extra lock in share mode", - "Table": "user_extra" + "Query": "select user_extra.id from user_extra lock in share mode" }, { "OperatorType": "Route", @@ -6055,7 +5818,6 @@ }, "FieldQuery": "select `user`.id from `user` where 1 != 1", "Query": "select `user`.id from `user` where `user`.id = :user_extra_id lock in share mode", - "Table": "`user`", "Values": [ ":user_extra_id" ], @@ -6077,7 +5839,6 @@ "KsidVindex": "user_index", "OwnedVindexQuery": "select Id, `Name`, Costly, `user`.`name` = 'foo' from `user` where `user`.id in ::dml_vals for update", "Query": "update `user` set `user`.`name` = 'foo' where `user`.id in ::dml_vals", - "Table": "user", "Values": [ "::dml_vals" ], @@ -6115,7 +5876,6 @@ "JoinVars": { "ue_id": 1 }, - "TableName": "user_extra_`user`", "Inputs": [ { "OperatorType": "Route", @@ -6125,8 +5885,7 @@ "Sharded": true }, "FieldQuery": "select ue.col, ue.id from user_extra as ue where 1 != 1", - "Query": "select ue.col, ue.id from user_extra as ue for update", - "Table": "user_extra" + "Query": "select ue.col, ue.id from user_extra as ue for update" }, { "OperatorType": "Route", @@ -6137,7 +5896,6 @@ }, "FieldQuery": "select u.id from `user` as u where 1 != 1", "Query": "select u.id from `user` as u where u.id = :ue_id for update", - "Table": "`user`", "Values": [ ":ue_id" ], @@ -6153,7 +5911,6 @@ "Sharded": true }, "Query": "update `user` as u set u.col = :ue_col /* INT16 */ where u.id in ::dml_vals", - "Table": "user", "Values": [ "::dml_vals" ], @@ -6191,7 +5948,6 @@ "JoinVars": { "ue_id": 2 }, - "TableName": "user_extra_`user`", "Inputs": [ { "OperatorType": "Route", @@ -6201,8 +5957,7 @@ "Sharded": true }, "FieldQuery": "select ue.foo, ue.bar, ue.id from user_extra as ue where 1 != 1", - "Query": "select ue.foo, ue.bar, ue.id from user_extra as ue for update", - "Table": "user_extra" + "Query": "select ue.foo, ue.bar, ue.id from user_extra as ue for update" }, { "OperatorType": "Route", @@ -6213,7 +5968,6 @@ }, "FieldQuery": "select u.id from `user` as u where 1 != 1", "Query": "select u.id from `user` as u where u.id = :ue_id for update", - "Table": "`user`", "Values": [ ":ue_id" ], @@ -6229,7 +5983,6 @@ "Sharded": true }, "Query": "update `user` as u set u.col = :ue_foo + :ue_bar + u.baz where u.id in ::dml_vals", - "Table": "user", "Values": [ "::dml_vals" ], @@ -6269,7 +6022,6 @@ "JoinVars": { "user_id": 0 }, - "TableName": "`user`_user_extra", "Inputs": [ { "OperatorType": "Route", @@ -6280,7 +6032,6 @@ }, "FieldQuery": "select `user`.id, `user`.baz from `user` where 1 != 1", "Query": "select `user`.id, `user`.baz from `user` where `user`.id = 1 for update", - "Table": "`user`", "Values": [ "1" ], @@ -6294,8 +6045,7 @@ "Sharded": true }, "FieldQuery": "select ue.id, ue.user_id from user_extra as ue where 1 != 1", - "Query": "select ue.id, ue.user_id from user_extra as ue where ue.id = :user_id for update", - "Table": "user_extra" + "Query": "select ue.id, ue.user_id from user_extra as ue where ue.id = :user_id for update" } ] }, @@ -6313,7 +6063,6 @@ "KsidVindex": "user_index", "OwnedVindexQuery": "select Id, `Name`, Costly, `user`.`name` = :ue_id + 'foo' from `user` where `user`.id in ::dml_vals for update", "Query": "update `user` set `user`.`name` = :ue_id + 'foo' where `user`.id in ::dml_vals", - "Table": "user", "Values": [ "::dml_vals" ], @@ -6327,7 +6076,6 @@ "Sharded": true }, "Query": "update user_extra as ue set ue.bar = :user_baz where (ue.id, ue.user_id) in ::dml_vals", - "Table": "user_extra", "Values": [ "dml_vals:1" ], @@ -6371,8 +6119,7 @@ "KsidLength": 1, "KsidVindex": "user_index", "OwnedVindexQuery": "select user_id, id from music as bar for update", - "Query": "delete from music as bar", - "Table": "music" + "Query": "delete from music as bar" }, "TablesUsed": [ "user.music" @@ -6394,8 +6141,7 @@ "Name": "user", "Sharded": true }, - "Query": "update music as bar set col = 23", - "Table": "music" + "Query": "update music as bar set col = 23" }, "TablesUsed": [ "user.music" @@ -6418,7 +6164,6 @@ "Sharded": true }, "Query": "insert into music(id, user_id) values (:_id_0, :_user_id_0)", - "TableName": "music", "VindexValues": { "music_user_map": "2", "user_index": "null" @@ -6454,7 +6199,6 @@ }, "FieldQuery": "select id from music where 1 != 1", "Query": "select id from music where user_id = 1", - "Table": "music", "Values": [ "1" ], @@ -6472,7 +6216,6 @@ "KsidVindex": "user_index", "OwnedVindexQuery": "select Id, `Name`, Costly from `user` where id = :__sq1 for update", "Query": "delete from `user` where id = :__sq1", - "Table": "user", "Values": [ ":__sq1" ], @@ -6510,8 +6253,7 @@ "Sharded": false }, "FieldQuery": "select id from unsharded where 1 != 1", - "Query": "select id from unsharded", - "Table": "unsharded" + "Query": "select id from unsharded" }, { "InputName": "Outer", @@ -6524,8 +6266,7 @@ "KsidLength": 1, "KsidVindex": "user_index", "OwnedVindexQuery": "select Id, `Name`, Costly from `user` where col = :__sq1 for update", - "Query": "delete from `user` where col = :__sq1", - "Table": "user" + "Query": "delete from `user` where col = :__sq1" } ] }, @@ -6559,8 +6300,7 @@ "Sharded": true }, "FieldQuery": "select id from `user` where 1 != 1", - "Query": "select id from `user`", - "Table": "`user`" + "Query": "select id from `user`" }, { "InputName": "Outer", @@ -6570,8 +6310,7 @@ "Name": "main", "Sharded": false }, - "Query": "delete from unsharded where col = :__sq1", - "Table": "unsharded" + "Query": "delete from unsharded where col = :__sq1" } ] }, @@ -6613,8 +6352,7 @@ "Sharded": true }, "FieldQuery": "select id from `user` where 1 != 1", - "Query": "select id from `user`", - "Table": "`user`" + "Query": "select id from `user`" }, { "InputName": "Outer", @@ -6625,8 +6363,7 @@ "Sharded": false }, "FieldQuery": "select id from unsharded where 1 != 1", - "Query": "select id from unsharded where id = :__sq2", - "Table": "unsharded" + "Query": "select id from unsharded where id = :__sq2" } ] }, @@ -6638,8 +6375,7 @@ "Name": "main", "Sharded": false }, - "Query": "delete from unsharded where col = :__sq1", - "Table": "unsharded" + "Query": "delete from unsharded where col = :__sq1" } ] }, @@ -6672,7 +6408,6 @@ "JoinVars": { "unsharded_id": 0 }, - "TableName": "unsharded_`user`", "Inputs": [ { "OperatorType": "Route", @@ -6682,8 +6417,7 @@ "Sharded": false }, "FieldQuery": "select unsharded.id from unsharded where 1 != 1", - "Query": "select unsharded.id from unsharded", - "Table": "unsharded" + "Query": "select unsharded.id from unsharded" }, { "OperatorType": "Route", @@ -6694,7 +6428,6 @@ }, "FieldQuery": "select id from `user` where 1 != 1", "Query": "select id from `user` where `user`.id = :unsharded_id", - "Table": "`user`", "Values": [ ":unsharded_id" ], @@ -6710,8 +6443,7 @@ "Name": "main", "Sharded": false }, - "Query": "delete from unsharded where col = :__sq1", - "Table": "unsharded" + "Query": "delete from unsharded where col = :__sq1" } ] }, @@ -6744,7 +6476,6 @@ "u_col": 1, "u_foo": 2 }, - "TableName": "`user`_music", "Inputs": [ { "OperatorType": "Route", @@ -6754,8 +6485,7 @@ "Sharded": true }, "FieldQuery": "select u.id, u.col, u.foo from `user` as u where 1 != 1", - "Query": "select u.id, u.col, u.foo from `user` as u where u.baz = 12 for update", - "Table": "`user`" + "Query": "select u.id, u.col, u.foo from `user` as u where u.baz = 12 for update" }, { "OperatorType": "Route", @@ -6765,8 +6495,7 @@ "Sharded": true }, "FieldQuery": "select m.id from music as m where 1 != 1", - "Query": "select m.id from music as m where m.baz = 21 and m.bar = :u_foo and m.col = :u_col /* INT16 */ for update", - "Table": "music" + "Query": "select m.id from music as m where m.baz = 21 and m.bar = :u_foo and m.col = :u_col /* INT16 */ for update" } ] }, @@ -6781,7 +6510,6 @@ "KsidVindex": "user_index", "OwnedVindexQuery": "select Id, `Name`, Costly from `user` as u where u.id in ::dml_vals for update", "Query": "delete from `user` as u where u.id in ::dml_vals", - "Table": "user", "Values": [ "::dml_vals" ], @@ -6798,7 +6526,6 @@ "KsidVindex": "user_index", "OwnedVindexQuery": "select user_id, id from music as m where m.id in ::dml_vals for update", "Query": "delete from music as m where m.id in ::dml_vals", - "Table": "music", "Values": [ "::dml_vals" ], @@ -6834,7 +6561,6 @@ "JoinVars": { "music_id": 0 }, - "TableName": "music_`user`", "Inputs": [ { "OperatorType": "Route", @@ -6844,8 +6570,7 @@ "Sharded": true }, "FieldQuery": "select music.id from music where 1 != 1", - "Query": "select music.id from music for update", - "Table": "music" + "Query": "select music.id from music for update" }, { "OperatorType": "Route", @@ -6856,7 +6581,6 @@ }, "FieldQuery": "select `user`.id from `user` where 1 != 1", "Query": "select `user`.id from `user` where `user`.id = :music_id for update", - "Table": "`user`", "Values": [ ":music_id" ], @@ -6875,7 +6599,6 @@ "KsidVindex": "user_index", "OwnedVindexQuery": "select user_id, id from music where music.id in ::dml_vals for update", "Query": "delete from music where music.id in ::dml_vals", - "Table": "music", "Values": [ "::dml_vals" ], @@ -6892,7 +6615,6 @@ "KsidVindex": "user_index", "OwnedVindexQuery": "select Id, `Name`, Costly from `user` where `user`.id in ::dml_vals for update", "Query": "delete from `user` where `user`.id in ::dml_vals", - "Table": "user", "Values": [ "::dml_vals" ], @@ -6929,8 +6651,7 @@ "Sharded": true }, "FieldQuery": "select u.id, m.id from `user` as u, music as m where 1 != 1", - "Query": "select u.id, m.id from `user` as u, music as m where u.id = m.user_id for update", - "Table": "`user`, music" + "Query": "select u.id, m.id from `user` as u, music as m where u.id = m.user_id for update" }, { "OperatorType": "Delete", @@ -6943,7 +6664,6 @@ "KsidVindex": "user_index", "OwnedVindexQuery": "select Id, `Name`, Costly from `user` as u where u.id in ::dml_vals for update", "Query": "delete from `user` as u where u.id in ::dml_vals", - "Table": "user", "Values": [ "::dml_vals" ], @@ -6960,7 +6680,6 @@ "KsidVindex": "user_index", "OwnedVindexQuery": "select user_id, id from music as m where m.id in ::dml_vals for update", "Query": "delete from music as m where m.id in ::dml_vals", - "Table": "music", "Values": [ "::dml_vals" ], @@ -6996,7 +6715,6 @@ "JoinVars": { "u_col": 1 }, - "TableName": "`user`_music", "Inputs": [ { "OperatorType": "Route", @@ -7006,8 +6724,7 @@ "Sharded": true }, "FieldQuery": "select u.id, u.col from `user` as u where 1 != 1", - "Query": "select u.id, u.col from `user` as u for update", - "Table": "`user`" + "Query": "select u.id, u.col from `user` as u for update" }, { "OperatorType": "Route", @@ -7017,8 +6734,7 @@ "Sharded": true }, "FieldQuery": "select m.id from music as m where 1 != 1", - "Query": "select m.id from music as m where m.col = :u_col /* INT16 */ for update", - "Table": "music" + "Query": "select m.id from music as m where m.col = :u_col /* INT16 */ for update" } ] }, @@ -7033,7 +6749,6 @@ "KsidVindex": "user_index", "OwnedVindexQuery": "select Id, `Name`, Costly from `user` as u where u.id in ::dml_vals for update", "Query": "delete from `user` as u where u.id in ::dml_vals", - "Table": "user", "Values": [ "::dml_vals" ], @@ -7050,7 +6765,6 @@ "KsidVindex": "user_index", "OwnedVindexQuery": "select user_id, id from music as m where m.id in ::dml_vals for update", "Query": "delete from music as m where m.id in ::dml_vals", - "Table": "music", "Values": [ "::dml_vals" ], @@ -7087,8 +6801,7 @@ "Sharded": true }, "FieldQuery": "select u.id, ue.id, ue.user_id from `user` as u, user_extra as ue where 1 != 1", - "Query": "select u.id, ue.id, ue.user_id from `user` as u, user_extra as ue where u.id = ue.user_id for update", - "Table": "`user`, user_extra" + "Query": "select u.id, ue.id, ue.user_id from `user` as u, user_extra as ue where u.id = ue.user_id for update" }, { "OperatorType": "Delete", @@ -7101,7 +6814,6 @@ "KsidVindex": "user_index", "OwnedVindexQuery": "select Id, `Name`, Costly from `user` as u where u.id in ::dml_vals for update", "Query": "delete from `user` as u where u.id in ::dml_vals", - "Table": "user", "Values": [ "::dml_vals" ], @@ -7115,7 +6827,6 @@ "Sharded": true }, "Query": "delete from user_extra as ue where (ue.id, ue.user_id) in ::dml_vals", - "Table": "user_extra", "Values": [ "dml_vals:1" ], @@ -7152,8 +6863,7 @@ "Sharded": true }, "FieldQuery": "select ev.oid, ev.ename, o.oid, o.region_id from `order` as o, order_event as ev where 1 != 1", - "Query": "select ev.oid, ev.ename, o.oid, o.region_id from `order` as o, order_event as ev where ev.ename = 'a' and o.oid = ev.oid for update", - "Table": "`order`, order_event" + "Query": "select ev.oid, ev.ename, o.oid, o.region_id from `order` as o, order_event as ev where ev.ename = 'a' and o.oid = ev.oid for update" }, { "OperatorType": "Delete", @@ -7163,7 +6873,6 @@ "Sharded": true }, "Query": "delete from order_event as ev where (ev.oid, ev.ename) in ::dml_vals", - "Table": "order_event", "Values": [ "dml_vals:0" ], @@ -7180,7 +6889,6 @@ "KsidVindex": "xxhash", "OwnedVindexQuery": "select region_id, oid from `order` as o where (o.oid, o.region_id) in ::dml_vals for update", "Query": "delete from `order` as o where (o.oid, o.region_id) in ::dml_vals", - "Table": "order", "Values": [ "dml_vals:1" ], @@ -7216,7 +6924,6 @@ "JoinVars": { "u_col": 1 }, - "TableName": "`user`_music", "Inputs": [ { "OperatorType": "Route", @@ -7226,8 +6933,7 @@ "Sharded": true }, "FieldQuery": "select u.id, u.col from `user` as u where 1 != 1", - "Query": "select u.id, u.col from `user` as u for update", - "Table": "`user`" + "Query": "select u.id, u.col from `user` as u for update" }, { "OperatorType": "Route", @@ -7237,8 +6943,7 @@ "Sharded": true }, "FieldQuery": "select m.id from music as m where 1 != 1", - "Query": "select m.id from music as m where m.col = :u_col /* INT16 */ for update", - "Table": "music" + "Query": "select m.id from music as m where m.col = :u_col /* INT16 */ for update" } ] }, @@ -7250,7 +6955,6 @@ "Sharded": true }, "Query": "update ignore `user` as u set u.foo = 21 where u.id in ::dml_vals", - "Table": "user", "Values": [ "::dml_vals" ], @@ -7264,7 +6968,6 @@ "Sharded": true }, "Query": "update ignore music as m set m.bar = 'abc' where m.id in ::dml_vals", - "Table": "music", "Values": [ "::dml_vals" ], @@ -7295,7 +6998,6 @@ }, "InsertIgnore": true, "Query": "insert into authoritative(user_id, col1, col2) values (:_user_id_0, '2', 3), (:_user_id_1, '5', 6) as new on duplicate key update col2 = new.user_id + new.col1", - "TableName": "authoritative", "VindexValues": { "user_index": "1, 4" } @@ -7322,7 +7024,6 @@ }, "InsertIgnore": true, "Query": "insert into authoritative(user_id, col1, col2) values (:_user_id_0, '2', 3), (:_user_id_1, '5', 6) as new (a, b, c) on duplicate key update col1 = a + c", - "TableName": "authoritative", "VindexValues": { "user_index": "1, 4" } @@ -7349,7 +7050,6 @@ }, "InsertIgnore": true, "Query": "insert into authoritative(user_id, col1, col2) values (:_user_id_0, '2', 3), (:_user_id_1, '5', 6) as new on duplicate key update col2 = new.user_id + new.col1", - "TableName": "authoritative", "VindexValues": { "user_index": "1, 4" } @@ -7376,7 +7076,6 @@ }, "InsertIgnore": true, "Query": "insert into authoritative(user_id, col1, col2) values (:_user_id_0, '2', 3), (:_user_id_1, '5', 6) as new (a, b, c) on duplicate key update col1 = a + c", - "TableName": "authoritative", "VindexValues": { "user_index": "1, 4" } diff --git a/go/vt/vtgate/planbuilder/testdata/dml_cases_with_user_as_default.json b/go/vt/vtgate/planbuilder/testdata/dml_cases_with_user_as_default.json index 5d2dfc3bbdd..6d224c52475 100644 --- a/go/vt/vtgate/planbuilder/testdata/dml_cases_with_user_as_default.json +++ b/go/vt/vtgate/planbuilder/testdata/dml_cases_with_user_as_default.json @@ -13,8 +13,7 @@ "Name": "main", "Sharded": false }, - "Query": "update ambiguous_ref_with_source set done = true where id = 1", - "Table": "ambiguous_ref_with_source" + "Query": "update ambiguous_ref_with_source set done = true where id = 1" }, "TablesUsed": [ "main.ambiguous_ref_with_source" diff --git a/go/vt/vtgate/planbuilder/testdata/filter_cases.json b/go/vt/vtgate/planbuilder/testdata/filter_cases.json index cf36f2f8ab1..ea78afe8451 100644 --- a/go/vt/vtgate/planbuilder/testdata/filter_cases.json +++ b/go/vt/vtgate/planbuilder/testdata/filter_cases.json @@ -14,8 +14,7 @@ "Sharded": true }, "FieldQuery": "select id from `user` where 1 != 1", - "Query": "select id from `user`", - "Table": "`user`" + "Query": "select id from `user`" }, "TablesUsed": [ "user.user" @@ -37,8 +36,7 @@ "Sharded": true }, "FieldQuery": "select id from `user` where 1 != 1", - "Query": "select id from `user` where someColumn = null", - "Table": "`user`" + "Query": "select id from `user` where someColumn = null" }, "TablesUsed": [ "user.user" @@ -60,8 +58,7 @@ "Sharded": true }, "FieldQuery": "select id from `user` where 1 != 1", - "Query": "select id from `user` where someColumn <=> null", - "Table": "`user`" + "Query": "select id from `user` where someColumn <=> null" }, "TablesUsed": [ "user.user" @@ -84,7 +81,6 @@ }, "FieldQuery": "select id from `user` where 1 != 1", "Query": "select id from `user` where `user`.id = 5", - "Table": "`user`", "Values": [ "5" ], @@ -111,7 +107,6 @@ }, "FieldQuery": "select id from `user` where 1 != 1", "Query": "select id from `user` where `user`.id = 5 + 5", - "Table": "`user`", "Values": [ "10" ], @@ -138,7 +133,6 @@ }, "FieldQuery": "select id from music where 1 != 1", "Query": "select id from music where id = 5 and user_id = 4", - "Table": "music", "Values": [ "4" ], @@ -177,7 +171,6 @@ }, "FieldQuery": "select `name`, keyspace_id from name_user_vdx where 1 != 1", "Query": "select `name`, keyspace_id from name_user_vdx where `name` in ::__vals", - "Table": "name_user_vdx", "Values": [ "::name" ], @@ -191,8 +184,7 @@ "Sharded": true }, "FieldQuery": "select id from `user` where 1 != 1", - "Query": "select id from `user` where costly = 'aa' and `name` = 'bb'", - "Table": "`user`" + "Query": "select id from `user` where costly = 'aa' and `name` = 'bb'" } ] }, @@ -229,7 +221,6 @@ }, "FieldQuery": "select `name`, keyspace_id from name_user_vdx where 1 != 1", "Query": "select `name`, keyspace_id from name_user_vdx where `name` in ::__vals", - "Table": "name_user_vdx", "Values": [ "::name" ], @@ -243,8 +234,7 @@ "Sharded": true }, "FieldQuery": "select id from `user` where 1 != 1", - "Query": "select id from `user` where costly in ('aa', 'bb') and `name` in ::__vals", - "Table": "`user`" + "Query": "select id from `user` where costly in ('aa', 'bb') and `name` in ::__vals" } ] }, @@ -281,7 +271,6 @@ }, "FieldQuery": "select `name`, keyspace_id from name_user_vdx where 1 != 1", "Query": "select `name`, keyspace_id from name_user_vdx where `name` in ::__vals", - "Table": "name_user_vdx", "Values": [ "::name" ], @@ -295,8 +284,7 @@ "Sharded": true }, "FieldQuery": "select id from `user` where 1 != 1", - "Query": "select id from `user` where (`name`, col) in (('aa', 'bb'), ('cc', 'dd'))", - "Table": "`user`" + "Query": "select id from `user` where (`name`, col) in (('aa', 'bb'), ('cc', 'dd'))" } ] }, @@ -333,7 +321,6 @@ }, "FieldQuery": "select `name`, keyspace_id from name_user_vdx where 1 != 1", "Query": "select `name`, keyspace_id from name_user_vdx where `name` in ::__vals", - "Table": "name_user_vdx", "Values": [ "::name" ], @@ -347,8 +334,7 @@ "Sharded": true }, "FieldQuery": "select id from `user` where 1 != 1", - "Query": "select id from `user` where (col, `name`) in (('aa', 'bb'), ('cc', 'dd'))", - "Table": "`user`" + "Query": "select id from `user` where (col, `name`) in (('aa', 'bb'), ('cc', 'dd'))" } ] }, @@ -385,7 +371,6 @@ }, "FieldQuery": "select `name`, keyspace_id from name_user_vdx where 1 != 1", "Query": "select `name`, keyspace_id from name_user_vdx where `name` in ::__vals", - "Table": "name_user_vdx", "Values": [ "::name" ], @@ -399,8 +384,7 @@ "Sharded": true }, "FieldQuery": "select id from `user` where 1 != 1", - "Query": "select id from `user` where (costly, `name`) in (('aa', 'bb'), ('cc', 'dd'))", - "Table": "`user`" + "Query": "select id from `user` where (costly, `name`) in (('aa', 'bb'), ('cc', 'dd'))" } ] }, @@ -437,7 +421,6 @@ }, "FieldQuery": "select `name`, keyspace_id from name_user_vdx where 1 != 1", "Query": "select `name`, keyspace_id from name_user_vdx where `name` in ::__vals", - "Table": "name_user_vdx", "Values": [ "::name" ], @@ -451,8 +434,7 @@ "Sharded": true }, "FieldQuery": "select id from `user` where 1 != 1", - "Query": "select id from `user` where (`name`, costly) in (('aa', 'bb'), ('cc', 'dd'))", - "Table": "`user`" + "Query": "select id from `user` where (`name`, costly) in (('aa', 'bb'), ('cc', 'dd'))" } ] }, @@ -489,7 +471,6 @@ }, "FieldQuery": "select `name`, keyspace_id from name_user_vdx where 1 != 1", "Query": "select `name`, keyspace_id from name_user_vdx where `name` in ::__vals", - "Table": "name_user_vdx", "Values": [ "::name" ], @@ -503,8 +484,7 @@ "Sharded": true }, "FieldQuery": "select id from `user` where 1 != 1", - "Query": "select id from `user` where (col, costly) in (('aa', 'bb')) and (col, `name`) in (('cc', 'dd'))", - "Table": "`user`" + "Query": "select id from `user` where (col, costly) in (('aa', 'bb')) and (col, `name`) in (('cc', 'dd'))" } ] }, @@ -529,7 +509,6 @@ }, "FieldQuery": "select id from `user` where 1 != 1", "Query": "select id from `user` where (col, `name`) in (('aa', 'bb')) and id = 5", - "Table": "`user`", "Values": [ "5" ], @@ -568,7 +547,6 @@ }, "FieldQuery": "select `name`, keyspace_id from name_user_vdx where 1 != 1", "Query": "select `name`, keyspace_id from name_user_vdx where `name` in ::__vals", - "Table": "name_user_vdx", "Values": [ "::name" ], @@ -582,8 +560,7 @@ "Sharded": true }, "FieldQuery": "select id from `user` where 1 != 1", - "Query": "select id from `user` where (costly, `name`) in (('aa', 'bb'), ('cc', 'dd'))", - "Table": "`user`" + "Query": "select id from `user` where (costly, `name`) in (('aa', 'bb'), ('cc', 'dd'))" } ] }, @@ -620,7 +597,6 @@ }, "FieldQuery": "select `name`, keyspace_id from name_user_vdx where 1 != 1", "Query": "select `name`, keyspace_id from name_user_vdx where `name` in ::__vals", - "Table": "name_user_vdx", "Values": [ "::name" ], @@ -634,8 +610,7 @@ "Sharded": true }, "FieldQuery": "select id from `user` where 1 != 1", - "Query": "select id from `user` where ((col1, `name`), col2) in ((('aa', 'bb'), 'cc'), (('dd', 'ee'), 'ff'))", - "Table": "`user`" + "Query": "select id from `user` where ((col1, `name`), col2) in ((('aa', 'bb'), 'cc'), (('dd', 'ee'), 'ff'))" } ] }, @@ -672,7 +647,6 @@ }, "FieldQuery": "select `name`, keyspace_id from name_user_vdx where 1 != 1", "Query": "select `name`, keyspace_id from name_user_vdx where `name` in ::__vals", - "Table": "name_user_vdx", "Values": [ "::name" ], @@ -686,8 +660,7 @@ "Sharded": true }, "FieldQuery": "select id from `user` where 1 != 1", - "Query": "select id from `user` where (`name`, (col1, col2)) in (('aa', ('bb', 'cc')), ('dd', ('ee', 'ff')))", - "Table": "`user`" + "Query": "select id from `user` where (`name`, (col1, col2)) in (('aa', ('bb', 'cc')), ('dd', ('ee', 'ff')))" } ] }, @@ -711,8 +684,7 @@ "Sharded": true }, "FieldQuery": "select id from `user` where 1 != 1", - "Query": "select id from `user` where ((col1, `name`), col2) in (('aa', 'bb', 'cc'), (('dd', 'ee'), 'ff'))", - "Table": "`user`" + "Query": "select id from `user` where ((col1, `name`), col2) in (('aa', 'bb', 'cc'), (('dd', 'ee'), 'ff'))" }, "TablesUsed": [ "user.user" @@ -735,8 +707,7 @@ "Sharded": true }, "FieldQuery": "select id from `user` where 1 != 1", - "Query": "select id from `user` where (col1, `name`) in (select * from music where music.user_id = `user`.id)", - "Table": "`user`" + "Query": "select id from `user` where (col1, `name`) in (select * from music where music.user_id = `user`.id)" }, "TablesUsed": [ "user.music", @@ -773,7 +744,6 @@ }, "FieldQuery": "select `name`, keyspace_id from name_user_vdx where 1 != 1", "Query": "select `name`, keyspace_id from name_user_vdx where `name` in ::__vals", - "Table": "name_user_vdx", "Values": [ "::name" ], @@ -787,8 +757,7 @@ "Sharded": true }, "FieldQuery": "select id from `user` where 1 != 1", - "Query": "select id from `user` where (col1, `name`) in (('aa', 1 + 1))", - "Table": "`user`" + "Query": "select id from `user` where (col1, `name`) in (('aa', 1 + 1))" } ] }, @@ -812,8 +781,7 @@ "Sharded": true }, "FieldQuery": "select Id from `user` where 1 != 1", - "Query": "select Id from `user` where 0", - "Table": "`user`" + "Query": "select Id from `user` where 0" }, "TablesUsed": [ "user.user" @@ -848,7 +816,6 @@ }, "FieldQuery": "select `name`, keyspace_id from name_user_vdx where 1 != 1", "Query": "select `name`, keyspace_id from name_user_vdx where `name` in ::__vals", - "Table": "name_user_vdx", "Values": [ "::name" ], @@ -862,8 +829,7 @@ "Sharded": true }, "FieldQuery": "select id from `user` where 1 != 1", - "Query": "select id from `user` where col = 'aa' and `name` = 'bb' or col = 'cc' and `name` = 'dd' or col = 'ee' and `name` = 'ff' or col = 'gg' and `name` = 'hh'", - "Table": "`user`" + "Query": "select id from `user` where col = 'aa' and `name` = 'bb' or col = 'cc' and `name` = 'dd' or col = 'ee' and `name` = 'ff' or col = 'gg' and `name` = 'hh'" } ] }, @@ -900,7 +866,6 @@ }, "FieldQuery": "select `name`, keyspace_id from name_user_vdx where 1 != 1", "Query": "select `name`, keyspace_id from name_user_vdx where `name` in ::__vals", - "Table": "name_user_vdx", "Values": [ "::name" ], @@ -914,8 +879,7 @@ "Sharded": true }, "FieldQuery": "select id from `user` where 1 != 1", - "Query": "select id from `user` where col in ('aa', 'cc', 'ee') and (col in ('aa', 'cc') or `name` = 'ff') and (col = 'aa' or `name` = 'dd' or col = 'ee') and (col = 'aa' or `name` = 'dd' or `name` = 'ff') and (`name` = 'bb' or col = 'cc' or col = 'ee') and (`name` = 'bb' or col = 'cc' or `name` = 'ff') and (`name` in ('bb', 'dd') or col = 'ee') and `name` in ::__vals", - "Table": "`user`" + "Query": "select id from `user` where col in ('aa', 'cc', 'ee') and (col in ('aa', 'cc') or `name` = 'ff') and (col = 'aa' or `name` = 'dd' or col = 'ee') and (col = 'aa' or `name` = 'dd' or `name` = 'ff') and (`name` = 'bb' or col = 'cc' or col = 'ee') and (`name` = 'bb' or col = 'cc' or `name` = 'ff') and (`name` in ('bb', 'dd') or col = 'ee') and `name` in ::__vals" } ] }, @@ -939,8 +903,7 @@ "Sharded": true }, "FieldQuery": "select id from `user` where 1 != 1", - "Query": "select id from `user` where `name` in (col, 'bb')", - "Table": "`user`" + "Query": "select id from `user` where `name` in (col, 'bb')" }, "TablesUsed": [ "user.user" @@ -975,7 +938,6 @@ }, "FieldQuery": "select `name`, keyspace_id from name_user_vdx where 1 != 1", "Query": "select `name`, keyspace_id from name_user_vdx where `name` in ::__vals", - "Table": "name_user_vdx", "Values": [ "::name" ], @@ -989,8 +951,7 @@ "Sharded": true }, "FieldQuery": "select id from `user` where 1 != 1", - "Query": "select id from `user` where `name` = :a", - "Table": "`user`" + "Query": "select id from `user` where `name` = :a" } ] }, @@ -1015,8 +976,7 @@ "Sharded": true }, "FieldQuery": "select u.id from `user` as u where 1 != 1", - "Query": "select u.id from `user` as u where not exists (select 1 from user_extra as ue where u.id = ue.user_id)", - "Table": "`user`" + "Query": "select u.id from `user` as u where not exists (select 1 from user_extra as ue where u.id = ue.user_id)" }, "TablesUsed": [ "user.user", @@ -1052,7 +1012,6 @@ }, "FieldQuery": "select `name`, keyspace_id from name_user_vdx where 1 != 1", "Query": "select `name`, keyspace_id from name_user_vdx where `name` in ::__vals", - "Table": "name_user_vdx", "Values": [ "::name" ], @@ -1066,8 +1025,7 @@ "Sharded": true }, "FieldQuery": "select id from `user` where 1 != 1", - "Query": "select id from `user` where `name` = 18446744073709551615", - "Table": "`user`" + "Query": "select id from `user` where `name` = 18446744073709551615" } ] }, @@ -1104,7 +1062,6 @@ }, "FieldQuery": "select `name`, keyspace_id from name_user_vdx where 1 != 1", "Query": "select `name`, keyspace_id from name_user_vdx where `name` in ::__vals", - "Table": "name_user_vdx", "Values": [ "::name" ], @@ -1118,8 +1075,7 @@ "Sharded": true }, "FieldQuery": "select id from `user` where 1 != 1", - "Query": "select id from `user` where `name` in ::__vals", - "Table": "`user`" + "Query": "select id from `user` where `name` in ::__vals" } ] }, @@ -1145,7 +1101,6 @@ }, "FieldQuery": "select user_extra.id from `user`, user_extra where 1 != 1", "Query": "select user_extra.id from `user`, user_extra where `user`.id = 5 and `user`.id = user_extra.user_id", - "Table": "`user`, user_extra", "Values": [ "5" ], @@ -1173,7 +1128,6 @@ }, "FieldQuery": "select user_extra.id from `user`, user_extra where 1 != 1", "Query": "select user_extra.id from `user`, user_extra where user_extra.user_id = 5 and `user`.id = user_extra.user_id", - "Table": "`user`, user_extra", "Values": [ "5" ], @@ -1201,7 +1155,6 @@ }, "FieldQuery": "select user_extra.id from `user` left join user_extra on `user`.id = user_extra.user_id where 1 != 1", "Query": "select user_extra.id from `user` left join user_extra on `user`.id = user_extra.user_id where `user`.id = 5", - "Table": "`user`, user_extra", "Values": [ "5" ], @@ -1229,7 +1182,6 @@ }, "FieldQuery": "select user_extra.id from `user`, user_extra where 1 != 1", "Query": "select user_extra.id from `user`, user_extra where user_extra.user_id = 5 and `user`.id = user_extra.user_id", - "Table": "`user`, user_extra", "Values": [ "5" ], @@ -1255,7 +1207,6 @@ "JoinVars": { "user_col": 0 }, - "TableName": "`user`_user_extra", "Inputs": [ { "OperatorType": "Route", @@ -1266,7 +1217,6 @@ }, "FieldQuery": "select `user`.col from `user` where 1 != 1", "Query": "select `user`.col from `user` where `user`.id = 5", - "Table": "`user`", "Values": [ "5" ], @@ -1280,8 +1230,7 @@ "Sharded": true }, "FieldQuery": "select user_extra.id from user_extra where 1 != 1", - "Query": "select user_extra.id from user_extra where user_extra.col = :user_col /* INT16 */", - "Table": "user_extra" + "Query": "select user_extra.id from user_extra where user_extra.col = :user_col /* INT16 */" } ] }, @@ -1308,7 +1257,6 @@ }, "FieldQuery": "select user_extra.id from `user`, user_extra where 1 != 1", "Query": "select user_extra.id from `user`, user_extra where `user`.id = 5 and user_extra.user_id = 5 and `user`.col = user_extra.col", - "Table": "`user`, user_extra", "Values": [ "5" ], @@ -1335,7 +1283,6 @@ "JoinVars": { "user_col": 0 }, - "TableName": "`user`_user_extra", "Inputs": [ { "OperatorType": "Route", @@ -1345,8 +1292,7 @@ "Sharded": true }, "FieldQuery": "select `user`.col from `user` where 1 != 1", - "Query": "select `user`.col from `user`", - "Table": "`user`" + "Query": "select `user`.col from `user`" }, { "OperatorType": "Route", @@ -1357,7 +1303,6 @@ }, "FieldQuery": "select user_extra.id from user_extra where 1 != 1", "Query": "select user_extra.id from user_extra where user_extra.user_id = :user_col /* INT16 */ and user_extra.col = :user_col /* INT16 */", - "Table": "user_extra", "Values": [ ":user_col" ], @@ -1386,7 +1331,6 @@ "JoinVars": { "user_col": 0 }, - "TableName": "`user`_user_extra", "Inputs": [ { "OperatorType": "Route", @@ -1396,8 +1340,7 @@ "Sharded": true }, "FieldQuery": "select `user`.col from `user` where 1 != 1", - "Query": "select `user`.col from `user`", - "Table": "`user`" + "Query": "select `user`.col from `user`" }, { "OperatorType": "Route", @@ -1407,8 +1350,7 @@ "Sharded": true }, "FieldQuery": "select user_extra.id from user_extra where 1 != 1", - "Query": "select user_extra.id from user_extra where user_extra.col = :user_col /* INT16 */", - "Table": "user_extra" + "Query": "select user_extra.id from user_extra where user_extra.col = :user_col /* INT16 */" } ] }, @@ -1435,7 +1377,6 @@ }, "FieldQuery": "select id from `user` where 1 != 1", "Query": "select id from `user` where `user`.col = 5 and `user`.id in ::__vals", - "Table": "`user`", "Values": [ "(1, 2)" ], @@ -1462,7 +1403,6 @@ }, "FieldQuery": "select id from `user` where 1 != 1", "Query": "select id from `user` where `user`.col = case `user`.col when 'foo' then true else false end and `user`.id in ::__vals", - "Table": "`user`", "Values": [ "(1, 2)" ], @@ -1501,7 +1441,6 @@ }, "FieldQuery": "select `name`, keyspace_id from name_user_vdx where 1 != 1", "Query": "select `name`, keyspace_id from name_user_vdx where `name` in ::__vals", - "Table": "name_user_vdx", "Values": [ "::name" ], @@ -1515,8 +1454,7 @@ "Sharded": true }, "FieldQuery": "select id or col as val from `user` where 1 != 1", - "Query": "select id or col as val from `user` where `user`.col = 5 and `user`.id in (1, 2) and `user`.`name` = 'aa'", - "Table": "`user`" + "Query": "select id or col as val from `user` where `user`.col = 5 and `user`.id in (1, 2) and `user`.`name` = 'aa'" } ] }, @@ -1553,7 +1491,6 @@ }, "FieldQuery": "select `name`, keyspace_id from name_user_vdx where 1 != 1", "Query": "select `name`, keyspace_id from name_user_vdx where `name` in ::__vals", - "Table": "name_user_vdx", "Values": [ "::name" ], @@ -1567,8 +1504,7 @@ "Sharded": true }, "FieldQuery": "select id from `user` where 1 != 1", - "Query": "select id from `user` where `user`.col = false and `user`.id in (1, 2) and `user`.`name` = 'aa'", - "Table": "`user`" + "Query": "select id from `user` where `user`.col = false and `user`.id in (1, 2) and `user`.`name` = 'aa'" } ] }, @@ -1593,7 +1529,6 @@ }, "FieldQuery": "select id from `user` where 1 != 1", "Query": "select id from `user` where `user`.col = 5 and `user`.id in (1, 2) and `user`.`name` = 'aa' and `user`.id = 1", - "Table": "`user`", "Values": [ "1" ], @@ -1620,7 +1555,6 @@ }, "FieldQuery": "select id from `user` where 1 != 1", "Query": "select id from `user` where `user`.id = 1 and `user`.`name` = 'aa' and `user`.id in (1, 2) and `user`.col = 5", - "Table": "`user`", "Values": [ "1" ], @@ -1647,7 +1581,6 @@ }, "FieldQuery": "select id from `user` where 1 != 1", "Query": "select id from `user` where (`user`.id = 1 or `user`.`name` = 'aa') and `user`.id in ::__vals", - "Table": "`user`", "Values": [ "(1, 2)" ], @@ -1672,7 +1605,6 @@ "JoinVars": { "unsharded_id": 0 }, - "TableName": "unsharded_`user`", "Inputs": [ { "OperatorType": "Route", @@ -1682,8 +1614,7 @@ "Sharded": false }, "FieldQuery": "select unsharded.id from unsharded where 1 != 1", - "Query": "select unsharded.id from unsharded", - "Table": "unsharded" + "Query": "select unsharded.id from unsharded" }, { "OperatorType": "Route", @@ -1694,7 +1625,6 @@ }, "FieldQuery": "select 1 from `user` where 1 != 1", "Query": "select 1 from `user` where `user`.id = :unsharded_id", - "Table": "`user`", "Values": [ ":unsharded_id" ], @@ -1725,7 +1655,6 @@ }, "FieldQuery": "select col from `user` as route1 where 1 != 1", "Query": "select col from `user` as route1 where id = 1", - "Table": "`user`", "Values": [ "1" ], @@ -1751,7 +1680,6 @@ "JoinVars": { "user_extra_col": 0 }, - "TableName": "user_extra_`user`", "Inputs": [ { "OperatorType": "Route", @@ -1761,8 +1689,7 @@ "Sharded": true }, "FieldQuery": "select user_extra.col from user_extra where 1 != 1", - "Query": "select user_extra.col from user_extra", - "Table": "user_extra" + "Query": "select user_extra.col from user_extra" }, { "OperatorType": "Route", @@ -1773,7 +1700,6 @@ }, "FieldQuery": "select u.m from `user` as u where 1 != 1", "Query": "select u.m from `user` as u where u.id in ::__vals and u.id in (select m2 from `user` where `user`.id = u.id and `user`.col = :user_extra_col /* INT16 */)", - "Table": "`user`", "Values": [ "(:user_extra_col, 1)" ], @@ -1802,7 +1728,6 @@ "JoinVars": { "user_extra_col": 0 }, - "TableName": "user_extra_`user`", "Inputs": [ { "OperatorType": "Route", @@ -1812,8 +1737,7 @@ "Sharded": true }, "FieldQuery": "select user_extra.col from user_extra where 1 != 1", - "Query": "select user_extra.col from user_extra", - "Table": "user_extra" + "Query": "select user_extra.col from user_extra" }, { "OperatorType": "Route", @@ -1824,7 +1748,6 @@ }, "FieldQuery": "select u.m from `user` as u where 1 != 1", "Query": "select u.m from `user` as u where u.id in ::__vals and u.id in (select m2 from `user` where `user`.id = u.id)", - "Table": "`user`", "Values": [ "(:user_extra_col, 1)" ], @@ -1850,7 +1773,6 @@ "OperatorType": "Join", "Variant": "Join", "JoinColumnIndexes": "R:0", - "TableName": "user_extra_`user`", "Inputs": [ { "OperatorType": "Route", @@ -1860,8 +1782,7 @@ "Sharded": true }, "FieldQuery": "select 1 from user_extra where 1 != 1", - "Query": "select 1 from user_extra", - "Table": "user_extra" + "Query": "select 1 from user_extra" }, { "OperatorType": "Route", @@ -1872,7 +1793,6 @@ }, "FieldQuery": "select u.m from `user` as u where 1 != 1", "Query": "select u.m from `user` as u where u.id = 5 and u.id in (select m2 from `user` where `user`.id = 5)", - "Table": "`user`", "Values": [ "5" ], @@ -1901,7 +1821,6 @@ "JoinVars": { "user_extra_col": 0 }, - "TableName": "user_extra_`user`", "Inputs": [ { "OperatorType": "Route", @@ -1911,8 +1830,7 @@ "Sharded": true }, "FieldQuery": "select user_extra.col from user_extra where 1 != 1", - "Query": "select user_extra.col from user_extra", - "Table": "user_extra" + "Query": "select user_extra.col from user_extra" }, { "OperatorType": "Route", @@ -1923,7 +1841,6 @@ }, "FieldQuery": "select u.m from `user` as u where 1 != 1", "Query": "select u.m from `user` as u where u.id in ::__vals and u.id in (select m2 from `user` where `user`.id = u.id and `user`.col = :user_extra_col /* INT16 */ and `user`.id in (select m3 from user_extra where user_extra.user_id = `user`.id))", - "Table": "`user`", "Values": [ "(:user_extra_col, 1)" ], @@ -1953,8 +1870,7 @@ "Sharded": true }, "FieldQuery": "select id from `user` where 1 != 1", - "Query": "select id from `user` where `user`.col in (select user_extra.col from user_extra where user_extra.user_id = `user`.id)", - "Table": "`user`" + "Query": "select id from `user` where `user`.col in (select user_extra.col from user_extra where user_extra.user_id = `user`.id)" }, "TablesUsed": [ "user.user", @@ -1979,7 +1895,6 @@ }, "FieldQuery": "select id from `user` where 1 != 1", "Query": "select id from `user` where id = 5 and `user`.col in (select user_extra.col from user_extra where user_extra.user_id = 5)", - "Table": "`user`", "Values": [ "5" ], @@ -2008,7 +1923,6 @@ }, "FieldQuery": "select id from `user` where 1 != 1", "Query": "select id from `user` where id = 'aa' and `user`.col in (select user_extra.col from user_extra where user_extra.user_id = 'aa')", - "Table": "`user`", "Values": [ "'aa'" ], @@ -2037,7 +1951,6 @@ }, "FieldQuery": "select id from `user` where 1 != 1", "Query": "select id from `user` where id = :a and `user`.col in (select user_extra.col from user_extra where user_extra.user_id = :a)", - "Table": "`user`", "Values": [ ":a" ], @@ -2071,8 +1984,7 @@ "Sharded": true }, "FieldQuery": "select id2 from `user` as uu where 1 != 1", - "Query": "select id2 from `user` as uu where id in (select id from `user` where id = uu.id and `user`.col in (select user_extra.col from user_extra where user_extra.user_id = uu.id))", - "Table": "`user`" + "Query": "select id2 from `user` as uu where id in (select id from `user` where id = uu.id and `user`.col in (select user_extra.col from user_extra where user_extra.user_id = uu.id))" }, "TablesUsed": [ "user.user", @@ -2105,8 +2017,7 @@ "Sharded": true }, "FieldQuery": "select col from `user` where 1 != 1", - "Query": "select col from `user`", - "Table": "`user`" + "Query": "select col from `user`" }, { "InputName": "Outer", @@ -2118,7 +2029,6 @@ }, "FieldQuery": "select id from `user` where 1 != 1", "Query": "select id from `user` where :__sq_has_values and id in ::__vals", - "Table": "`user`", "Values": [ "::__sq1" ], @@ -2155,8 +2065,7 @@ "Sharded": true }, "FieldQuery": "select col from `user` where 1 != 1", - "Query": "select col from `user`", - "Table": "`user`" + "Query": "select col from `user`" }, { "InputName": "Outer", @@ -2167,8 +2076,7 @@ "Sharded": true }, "FieldQuery": "select id from `user` where 1 != 1", - "Query": "select id from `user` where not :__sq_has_values or id not in ::__sq1", - "Table": "`user`" + "Query": "select id from `user` where not :__sq_has_values or id not in ::__sq1" } ] }, @@ -2204,8 +2112,7 @@ "Sharded": true }, "FieldQuery": "select 1 from `user` where 1 != 1", - "Query": "select 1 from `user` limit 1", - "Table": "`user`" + "Query": "select 1 from `user` limit 1" } ] }, @@ -2218,8 +2125,7 @@ "Sharded": true }, "FieldQuery": "select id from `user` where 1 != 1", - "Query": "select id from `user` where :__sq_has_values", - "Table": "`user`" + "Query": "select id from `user` where :__sq_has_values" } ] }, @@ -2251,8 +2157,7 @@ "Sharded": true }, "FieldQuery": "select col from `user` where 1 != 1", - "Query": "select col from `user`", - "Table": "`user`" + "Query": "select col from `user`" }, { "InputName": "Outer", @@ -2264,7 +2169,6 @@ }, "FieldQuery": "select id from `user` where 1 != 1", "Query": "select id from `user` where id = :__sq1", - "Table": "`user`", "Values": [ ":__sq1" ], @@ -2309,8 +2213,7 @@ "Sharded": true }, "FieldQuery": "select id3 from `user` where 1 != 1", - "Query": "select id3 from `user`", - "Table": "`user`" + "Query": "select id3 from `user`" }, { "InputName": "Outer", @@ -2321,8 +2224,7 @@ "Sharded": true }, "FieldQuery": "select id2 from `user` where 1 != 1", - "Query": "select id2 from `user` where :__sq_has_values and id2 in ::__sq2", - "Table": "`user`" + "Query": "select id2 from `user` where :__sq_has_values and id2 in ::__sq2" } ] }, @@ -2336,7 +2238,6 @@ }, "FieldQuery": "select id1 from `user` where 1 != 1", "Query": "select id1 from `user` where id = :__sq1", - "Table": "`user`", "Values": [ ":__sq1" ], @@ -2364,8 +2265,7 @@ "Sharded": true }, "FieldQuery": "select col from `user` where 1 != 1", - "Query": "select col from `user` where id = (select id from `user` as route1 where route1.id = `user`.id)", - "Table": "`user`" + "Query": "select col from `user` where id = (select id from `user` as route1 where route1.id = `user`.id)" }, "TablesUsed": [ "user.user" @@ -2396,8 +2296,7 @@ "Sharded": false }, "FieldQuery": "select id from unsharded as route2 where 1 != 1", - "Query": "select id from unsharded as route2", - "Table": "unsharded" + "Query": "select id from unsharded as route2" }, { "InputName": "Outer", @@ -2409,7 +2308,6 @@ }, "FieldQuery": "select col from `user` where 1 != 1", "Query": "select col from `user` where id = :__sq1", - "Table": "`user`", "Values": [ ":__sq1" ], @@ -2440,7 +2338,6 @@ }, "FieldQuery": "select user_extra.Id from `user`, user_extra where 1 != 1", "Query": "select user_extra.Id from `user`, user_extra where `user`.Id = 5 and `user`.iD = user_extra.User_Id", - "Table": "`user`, user_extra", "Values": [ "5" ], @@ -2468,8 +2365,7 @@ "Sharded": true }, "FieldQuery": "select id from `user` where 1 != 1", - "Query": "select id from `user` where database()", - "Table": "`user`" + "Query": "select id from `user` where database()" }, "TablesUsed": [ "user.user" @@ -2491,8 +2387,7 @@ "Sharded": true }, "FieldQuery": "select id from music where 1 != 1", - "Query": "select id from music where id = null", - "Table": "music" + "Query": "select id from music where id = null" }, "TablesUsed": [ "user.music" @@ -2514,8 +2409,7 @@ "Sharded": true }, "FieldQuery": "select id from music where 1 != 1", - "Query": "select id from music where id is null", - "Table": "music" + "Query": "select id from music where id is null" }, "TablesUsed": [ "user.music" @@ -2537,8 +2431,7 @@ "Sharded": true }, "FieldQuery": "select id from music where 1 != 1", - "Query": "select id from music where id is not null", - "Table": "music" + "Query": "select id from music where id is not null" }, "TablesUsed": [ "user.music" @@ -2560,8 +2453,7 @@ "Sharded": true }, "FieldQuery": "select id from music where 1 != 1", - "Query": "select id from music where user_id = 4 and id = null", - "Table": "music" + "Query": "select id from music where user_id = 4 and id = null" }, "TablesUsed": [ "user.music" @@ -2583,8 +2475,7 @@ "Sharded": true }, "FieldQuery": "select id from music where 1 != 1", - "Query": "select id from music where user_id = 4 and id in (null)", - "Table": "music" + "Query": "select id from music where user_id = 4 and id in (null)" }, "TablesUsed": [ "user.music" @@ -2607,7 +2498,6 @@ }, "FieldQuery": "select id from music where 1 != 1", "Query": "select id from music where user_id = 4 and id in (null, 1, 2)", - "Table": "music", "Values": [ "4" ], @@ -2633,8 +2523,7 @@ "Sharded": true }, "FieldQuery": "select id from music where 1 != 1", - "Query": "select id from music where user_id = 4 and id not in (null, 1, 2)", - "Table": "music" + "Query": "select id from music where user_id = 4 and id not in (null, 1, 2)" }, "TablesUsed": [ "user.music" @@ -2656,8 +2545,7 @@ "Sharded": true }, "FieldQuery": "select id from music where 1 != 1", - "Query": "select id from music where id not in (null, 1, 2) and user_id = 4", - "Table": "music" + "Query": "select id from music where id not in (null, 1, 2) and user_id = 4" }, "TablesUsed": [ "user.music" @@ -2689,7 +2577,6 @@ }, "FieldQuery": "select user_extra.col from user_extra where 1 != 1", "Query": "select user_extra.col from user_extra where user_extra.user_id = 411", - "Table": "user_extra", "Values": [ "411" ], @@ -2714,7 +2601,6 @@ }, "FieldQuery": "select user_extra.col from user_extra where 1 != 1", "Query": "select user_extra.col from user_extra where user_extra.user_id = 42", - "Table": "user_extra", "Values": [ "42" ], @@ -2730,7 +2616,6 @@ }, "FieldQuery": "select id from `user` where 1 != 1", "Query": "select id from `user` where (not :__sq_has_values or id not in ::__sq1) and :__sq_has_values1 and id in ::__vals", - "Table": "`user`", "Values": [ "::__sq2" ], @@ -2763,7 +2648,6 @@ }, "FieldQuery": "select c2 from cfc_vindex_col where 1 != 1", "Query": "select c2 from cfc_vindex_col where c1 like 'A%'", - "Table": "cfc_vindex_col", "Values": [ "'A%'" ], @@ -2790,7 +2674,6 @@ }, "FieldQuery": "select col from samecolvin where 1 != 1", "Query": "select col from samecolvin where col = :col", - "Table": "samecolvin", "Values": [ ":col" ], @@ -2817,8 +2700,7 @@ "Sharded": true }, "FieldQuery": "select id from `user` where 1 != 1", - "Query": "select id from `user` where `user`.id > 5", - "Table": "`user`" + "Query": "select id from `user` where `user`.id > 5" }, "TablesUsed": [ "user.user" @@ -2840,8 +2722,7 @@ "Sharded": false }, "FieldQuery": "select unsharded.id from unsharded where 1 != 1", - "Query": "select unsharded.id from unsharded where unsharded.`name` in (select `name` from unsharded_a)", - "Table": "unsharded, unsharded_a" + "Query": "select unsharded.id from unsharded where unsharded.`name` in (select `name` from unsharded_a)" }, "TablesUsed": [ "main.unsharded", @@ -2873,8 +2754,7 @@ "Sharded": false }, "FieldQuery": "select col from unsharded where 1 != 1", - "Query": "select col from unsharded where col = id", - "Table": "unsharded" + "Query": "select col from unsharded where col = id" }, { "InputName": "Outer", @@ -2886,7 +2766,6 @@ }, "FieldQuery": "select id from `user` where 1 != 1", "Query": "select id from `user` where :__sq_has_values and id in ::__vals", - "Table": "`user`", "Values": [ "::__sq1" ], @@ -2915,8 +2794,7 @@ "Sharded": true }, "FieldQuery": "select u.id from `user` as u where 1 != 1", - "Query": "select u.id from `user` as u where u.col in (select ue.user_id from user_extra as ue where ue.user_id = u.id)", - "Table": "`user`" + "Query": "select u.id from `user` as u where u.col in (select ue.user_id from user_extra as ue where ue.user_id = u.id)" }, "TablesUsed": [ "user.user", @@ -2940,8 +2818,7 @@ "Sharded": false }, "FieldQuery": "select t.table_schema from information_schema.`tables` as t where 1 != 1", - "Query": "select t.table_schema from information_schema.`tables` as t where t.table_schema in (select c.`column_name` from information_schema.`columns` as c)", - "Table": "information_schema.`tables`" + "Query": "select t.table_schema from information_schema.`tables` as t where t.table_schema in (select c.`column_name` from information_schema.`columns` as c)" } }, "skip_e2e": true @@ -2961,8 +2838,7 @@ "Sharded": true }, "FieldQuery": "select ref.col from ref where 1 != 1", - "Query": "select ref.col from ref where ref.col in (select ref.col from ref)", - "Table": "ref" + "Query": "select ref.col from ref where ref.col in (select ref.col from ref)" }, "TablesUsed": [ "user.ref" @@ -2985,7 +2861,6 @@ }, "FieldQuery": "select u1.col from `user` as u1 where 1 != 1", "Query": "select u1.col from `user` as u1 where u1.id = 5 and u1.`name` in (select u2.`name` from `user` as u2 where u2.id = 5)", - "Table": "`user`", "Values": [ "5" ], @@ -3012,7 +2887,6 @@ }, "FieldQuery": "select u1.col from `user` as u1 where 1 != 1", "Query": "select u1.col from `user` as u1 where u1.id = 5 and exists (select 1 from `user` as u2 where u2.id = 5)", - "Table": "`user`", "Values": [ "5" ], @@ -3039,7 +2913,6 @@ }, "FieldQuery": "select u1.col from `user` as u1 where 1 != 1", "Query": "select u1.col from `user` as u1 where u1.id = 5 and not exists (select 1 from `user` as u2 where u2.id = 5)", - "Table": "`user`", "Values": [ "5" ], @@ -3074,7 +2947,6 @@ }, "FieldQuery": "select 1 from `user` as u2 where 1 != 1", "Query": "select 1 from `user` as u2 where u2.id = 5 limit 1", - "Table": "`user`", "Values": [ "5" ], @@ -3089,8 +2961,7 @@ "Sharded": true }, "FieldQuery": "select u1.col from `user` as u1 where 1 != 1", - "Query": "select u1.col from `user` as u1 where not :__sq_has_values", - "Table": "`user`" + "Query": "select u1.col from `user` as u1 where not :__sq_has_values" } ] }, @@ -3124,7 +2995,6 @@ }, "FieldQuery": "select user_extra.col from user_extra where 1 != 1", "Query": "select user_extra.col from user_extra where user_extra.user_id = 4", - "Table": "user_extra", "Values": [ "4" ], @@ -3140,7 +3010,6 @@ }, "FieldQuery": "select id from `user` where 1 != 1", "Query": "select id from `user` where id = 5 and id not in (select user_extra.col from user_extra where user_extra.user_id = 5) and :__sq_has_values and id in ::__sq2", - "Table": "`user`", "Values": [ "5" ], @@ -3180,7 +3049,6 @@ }, "FieldQuery": "select user_extra.col from user_extra where 1 != 1", "Query": "select user_extra.col from user_extra where user_extra.user_id = 4", - "Table": "user_extra", "Values": [ "4" ], @@ -3196,7 +3064,6 @@ }, "FieldQuery": "select id from `user` where 1 != 1", "Query": "select id from `user` where id = 5 and id in (select user_extra.col from user_extra where user_extra.user_id = 5) and (not :__sq_has_values or id not in ::__sq1)", - "Table": "`user`", "Values": [ "5" ], @@ -3226,8 +3093,7 @@ "Sharded": true }, "FieldQuery": "select u.id from `user` as u where 1 != 1", - "Query": "select u.id from `user` as u where u.col in (select ue.user_id from user_extra as ue where ue.user_id = u.id) and u.col2 in (select ue.user_id from user_extra as ue where ue.user_id = u.id)", - "Table": "`user`" + "Query": "select u.id from `user` as u where u.col in (select ue.user_id from user_extra as ue where ue.user_id = u.id) and u.col2 in (select ue.user_id from user_extra as ue where ue.user_id = u.id)" }, "TablesUsed": [ "user.user", @@ -3252,7 +3118,6 @@ }, "FieldQuery": "select id from `user` where 1 != 1", "Query": "select id from `user` where `user`.id = `user`.col and `user`.col = 5", - "Table": "`user`", "Values": [ "5" ], @@ -3278,8 +3143,7 @@ "Sharded": true }, "FieldQuery": "select id from `user`, user_extra where 1 != 1", - "Query": "select id from `user`, user_extra where user_extra.col = user_extra.user_id and `user`.id = user_extra.col", - "Table": "`user`, user_extra" + "Query": "select id from `user`, user_extra where user_extra.col = user_extra.user_id and `user`.id = user_extra.col" }, "TablesUsed": [ "user.user", @@ -3302,7 +3166,6 @@ "JoinVars": { "user_extra_col": 0 }, - "TableName": "user_extra_`user`", "Inputs": [ { "OperatorType": "Route", @@ -3312,8 +3175,7 @@ "Sharded": true }, "FieldQuery": "select user_extra.col from user_extra where 1 != 1", - "Query": "select user_extra.col from user_extra where user_extra.col = user_extra.user_id or user_extra.col2 = user_extra.`name`", - "Table": "user_extra" + "Query": "select user_extra.col from user_extra where user_extra.col = user_extra.user_id or user_extra.col2 = user_extra.`name`" }, { "OperatorType": "Route", @@ -3324,7 +3186,6 @@ }, "FieldQuery": "select id from `user` where 1 != 1", "Query": "select id from `user` where `user`.id = :user_extra_col /* INT16 */", - "Table": "`user`", "Values": [ ":user_extra_col" ], @@ -3354,8 +3215,7 @@ "Sharded": true }, "FieldQuery": "select col from `user` where 1 != 1", - "Query": "select col from `user` where id = (select id from `user` as a where a.id = `user`.id)", - "Table": "`user`" + "Query": "select col from `user` where id = (select id from `user` as a where a.id = `user`.id)" }, "TablesUsed": [ "user.user" @@ -3377,7 +3237,6 @@ "JoinVars": { "user_col": 1 }, - "TableName": "`user`_user_extra", "Inputs": [ { "OperatorType": "Route", @@ -3387,8 +3246,7 @@ "Sharded": true }, "FieldQuery": "select `user`.id, `user`.col from `user` where 1 != 1", - "Query": "select `user`.id, `user`.col from `user`", - "Table": "`user`" + "Query": "select `user`.id, `user`.col from `user`" }, { "OperatorType": "Route", @@ -3398,8 +3256,7 @@ "Sharded": true }, "FieldQuery": "select 1 from user_extra where 1 != 1", - "Query": "select 1 from user_extra where user_extra.foobar = 5 and user_extra.col = :user_col /* INT16 */", - "Table": "user_extra" + "Query": "select 1 from user_extra where user_extra.foobar = 5 and user_extra.col = :user_col /* INT16 */" } ] }, @@ -3435,7 +3292,6 @@ "JoinVars": { "user_col": 1 }, - "TableName": "`user`_user_extra", "Inputs": [ { "OperatorType": "Route", @@ -3445,8 +3301,7 @@ "Sharded": true }, "FieldQuery": "select `user`.id, `user`.col from `user` where 1 != 1", - "Query": "select `user`.id, `user`.col from `user`", - "Table": "`user`" + "Query": "select `user`.id, `user`.col from `user`" }, { "OperatorType": "Route", @@ -3456,8 +3311,7 @@ "Sharded": true }, "FieldQuery": "select user_extra.id from user_extra where 1 != 1", - "Query": "select user_extra.id from user_extra where user_extra.col = :user_col /* INT16 */", - "Table": "user_extra" + "Query": "select user_extra.id from user_extra where user_extra.col = :user_col /* INT16 */" } ] } @@ -3502,8 +3356,7 @@ "Sharded": true }, "FieldQuery": "select id from music where 1 != 1", - "Query": "select id from music where col2 = 'a'", - "Table": "music" + "Query": "select id from music where col2 = 'a'" }, { "InputName": "Outer", @@ -3514,8 +3367,7 @@ "Sharded": true }, "FieldQuery": "select `user`.id, `user`.col, weight_string(`user`.id) from `user` where 1 != 1", - "Query": "select `user`.id, `user`.col, weight_string(`user`.id) from `user` where :__sq_has_values and `user`.col in ::__sq1", - "Table": "`user`" + "Query": "select `user`.id, `user`.col, weight_string(`user`.id) from `user` where :__sq_has_values and `user`.col in ::__sq1" } ] } @@ -3555,7 +3407,6 @@ }, "FieldQuery": "select colb, keyspace_id from colb_colc_map where 1 != 1", "Query": "select colb, keyspace_id from colb_colc_map where colb in ::__vals", - "Table": "colb_colc_map", "Values": [ "::colb" ], @@ -3569,8 +3420,7 @@ "Sharded": true }, "FieldQuery": "select * from multicolvin where 1 != 1", - "Query": "select * from multicolvin where column_b = 1", - "Table": "multicolvin" + "Query": "select * from multicolvin where column_b = 1" } ] }, @@ -3607,7 +3457,6 @@ }, "FieldQuery": "select colb, keyspace_id from colb_colc_map where 1 != 1", "Query": "select colb, keyspace_id from colb_colc_map where colb in ::__vals", - "Table": "colb_colc_map", "Values": [ "::colb" ], @@ -3621,8 +3470,7 @@ "Sharded": true }, "FieldQuery": "select * from multicolvin where 1 != 1", - "Query": "select * from multicolvin where column_b = 1 and column_c = 2", - "Table": "multicolvin" + "Query": "select * from multicolvin where column_b = 1 and column_c = 2" } ] }, @@ -3659,7 +3507,6 @@ }, "FieldQuery": "select colb, keyspace_id from colb_colc_map where 1 != 1", "Query": "select colb, keyspace_id from colb_colc_map where colb in ::__vals", - "Table": "colb_colc_map", "Values": [ "::colb" ], @@ -3673,8 +3520,7 @@ "Sharded": true }, "FieldQuery": "select * from multicolvin where 1 != 1", - "Query": "select * from multicolvin where column_b = 1 and column_c = 2 and column_a = 3", - "Table": "multicolvin" + "Query": "select * from multicolvin where column_b = 1 and column_c = 2 and column_a = 3" } ] }, @@ -3711,7 +3557,6 @@ }, "FieldQuery": "select colb, keyspace_id from colb_colc_map where 1 != 1", "Query": "select colb, keyspace_id from colb_colc_map where colb in ::__vals", - "Table": "colb_colc_map", "Values": [ "::colb" ], @@ -3725,8 +3570,7 @@ "Sharded": true }, "FieldQuery": "select * from multicolvin where 1 != 1", - "Query": "select * from multicolvin where column_a = 3 and column_b = 1", - "Table": "multicolvin" + "Query": "select * from multicolvin where column_a = 3 and column_b = 1" } ] }, @@ -3751,7 +3595,6 @@ }, "FieldQuery": "select * from multicol_tbl where 1 != 1", "Query": "select * from multicol_tbl where cola = 1 and colb = 2", - "Table": "multicol_tbl", "Values": [ "1", "2" @@ -3779,7 +3622,6 @@ }, "FieldQuery": "select * from multicol_tbl where 1 != 1", "Query": "select * from multicol_tbl where colb = 2 and cola = 1", - "Table": "multicol_tbl", "Values": [ "1", "2" @@ -3807,7 +3649,6 @@ }, "FieldQuery": "select * from multicol_tbl where 1 != 1", "Query": "select * from multicol_tbl where cola in ::__vals0 and colb in ::__vals1", - "Table": "multicol_tbl", "Values": [ "(1, 2)", "(3, 4)" @@ -3835,7 +3676,6 @@ }, "FieldQuery": "select * from multicol_tbl where 1 != 1", "Query": "select * from multicol_tbl where colb in ::__vals1 and cola in ::__vals0", - "Table": "multicol_tbl", "Values": [ "(1, 2)", "(3, 4)" @@ -3863,7 +3703,6 @@ }, "FieldQuery": "select * from multicol_tbl where 1 != 1", "Query": "select * from multicol_tbl where colb = 1 and cola in ::__vals0", - "Table": "multicol_tbl", "Values": [ "(3, 4)", "1" @@ -3891,7 +3730,6 @@ }, "FieldQuery": "select id from `user` where 1 != 1", "Query": "select id from `user` where id = 34 and `name` = 'apa'", - "Table": "`user`", "Values": [ "34" ], @@ -3918,7 +3756,6 @@ }, "FieldQuery": "select * from multicol_tbl where 1 != 1", "Query": "select * from multicol_tbl where cola in (1, 10) and cola = 4 and colb in (5, 6) and colb = 7", - "Table": "multicol_tbl", "Values": [ "4", "7" @@ -3946,7 +3783,6 @@ }, "FieldQuery": "select * from multicol_tbl where 1 != 1", "Query": "select * from multicol_tbl where colb = 4 and colb in ::__vals1 and cola in ::__vals0", - "Table": "multicol_tbl", "Values": [ "(5, 6)", "(1, 10)" @@ -3974,7 +3810,6 @@ }, "FieldQuery": "select * from multicol_tbl where 1 != 1", "Query": "select * from multicol_tbl where colb in (1, 10) and colb = 4 and cola in ::__vals0", - "Table": "multicol_tbl", "Values": [ "(5, 6)", "4" @@ -4002,7 +3837,6 @@ }, "FieldQuery": "select * from multicol_tbl where 1 != 1", "Query": "select * from multicol_tbl where colb in (1, 2) and cola in (3, 4) and cola = 5 and colb = 6", - "Table": "multicol_tbl", "Values": [ "5", "6" @@ -4030,7 +3864,6 @@ }, "FieldQuery": "select * from multicol_tbl where 1 != 1", "Query": "select * from multicol_tbl where (cola, colb) in ((1, 2), (3, 4))", - "Table": "multicol_tbl", "Values": [ "(1, 3)", "(2, 4)" @@ -4058,7 +3891,6 @@ }, "FieldQuery": "select * from multicol_tbl where 1 != 1", "Query": "select * from multicol_tbl where cola = 1", - "Table": "multicol_tbl", "Values": [ "1" ], @@ -4085,7 +3917,6 @@ }, "FieldQuery": "select * from multicol_tbl where 1 != 1", "Query": "select * from multicol_tbl where cola = 1 and colb in ::__vals1", - "Table": "multicol_tbl", "Values": [ "1", "(2, 3)" @@ -4112,8 +3943,7 @@ "Sharded": false }, "FieldQuery": "select 0 from unsharded_a left join unsharded_b on unsharded_a.col = unsharded_b.col where 1 != 1", - "Query": "select 0 from unsharded_a left join unsharded_b on unsharded_a.col = unsharded_b.col where coalesce(unsharded_b.col, 4) = 5", - "Table": "unsharded_a, unsharded_b" + "Query": "select 0 from unsharded_a left join unsharded_b on unsharded_a.col = unsharded_b.col where coalesce(unsharded_b.col, 4) = 5" }, "TablesUsed": [ "main.unsharded_a", @@ -4136,8 +3966,7 @@ "Sharded": true }, "FieldQuery": "select `user`.col from user_extra left join `user` on user_extra.user_id = `user`.id where 1 != 1", - "Query": "select `user`.col from user_extra left join `user` on user_extra.user_id = `user`.id where `user`.id is null", - "Table": "`user`, user_extra" + "Query": "select `user`.col from user_extra left join `user` on user_extra.user_id = `user`.id where `user`.id is null" }, "TablesUsed": [ "user.user", @@ -4162,7 +3991,6 @@ }, "FieldQuery": "select music.id from music left join `user` on music.user_id = `user`.id where 1 != 1", "Query": "select music.id from music left join `user` on music.user_id = `user`.id where music.user_id = 10 and `user`.id <=> null", - "Table": "`user`, music", "Values": [ "10" ], @@ -4190,7 +4018,6 @@ }, "FieldQuery": "select music.id from music left join `user` on music.user_id = `user`.id where 1 != 1", "Query": "select music.id from music left join `user` on music.user_id = `user`.id where music.user_id = 5 and (`user`.`name` = 'Trent Reznor' or music.genre = 'pop')", - "Table": "`user`, music", "Values": [ "5" ], @@ -4218,7 +4045,6 @@ }, "FieldQuery": "select music.id from music left join `user` on music.user_id = `user`.id where 1 != 1", "Query": "select music.id from music left join `user` on music.user_id = `user`.id where music.user_id = 5 and (`user`.`name` = 'Trent Reznor' or music.genre = 'pop')", - "Table": "`user`, music", "Values": [ "5" ], @@ -4246,7 +4072,6 @@ }, "FieldQuery": "select music.id from music, `user` where 1 != 1", "Query": "select music.id from music, `user` where music.user_id = 5 and music.user_id = `user`.id and music.componist = `user`.`name`", - "Table": "`user`, music", "Values": [ "5" ], @@ -4274,7 +4099,6 @@ }, "FieldQuery": "select music.id from music, `user` where 1 != 1", "Query": "select music.id from music, `user` where music.user_id = 5 and `user`.id is not null and `user`.id = music.user_id", - "Table": "`user`, music", "Values": [ "5" ], @@ -4302,7 +4126,6 @@ }, "FieldQuery": "select col from `user` where 1 != 1", "Query": "select col from `user` where id in ::__vals", - "Table": "`user`", "Values": [ "(1, 2)" ], @@ -4329,7 +4152,6 @@ }, "FieldQuery": "select col from `user` where 1 != 1", "Query": "select col from `user` where id in ::__vals", - "Table": "`user`", "Values": [ "(1, 2, 3)" ], @@ -4356,7 +4178,6 @@ }, "FieldQuery": "select col from `user` where 1 != 1", "Query": "select col from `user` where id in ::__vals", - "Table": "`user`", "Values": [ "(1, 2, 3, 4)" ], @@ -4383,7 +4204,6 @@ }, "FieldQuery": "select id from music where 1 != 1", "Query": "select id from music where id is null and user_id in ::__vals", - "Table": "music", "Values": [ "(1, 2)" ], @@ -4409,8 +4229,7 @@ "Sharded": true }, "FieldQuery": "select a + 2 as a from `user` where 1 != 1", - "Query": "select a + 2 as a from `user` where `user`.a + 2 = 42", - "Table": "`user`" + "Query": "select a + 2 as a from `user` where `user`.a + 2 = 42" }, "TablesUsed": [ "user.user" @@ -4434,8 +4253,7 @@ "FieldQuery": "select a + 2 as a, weight_string(a + 2) from `user` where 1 != 1", "OrderBy": "(0|1) ASC", "Query": "select a + 2 as a, weight_string(a + 2) from `user` order by `user`.a + 2 asc", - "ResultColumns": 1, - "Table": "`user`" + "ResultColumns": 1 }, "TablesUsed": [ "user.user" @@ -4457,8 +4275,7 @@ "Sharded": true }, "FieldQuery": "select `user`.col + 2 as a from `user` where 1 != 1", - "Query": "select `user`.col + 2 as a from `user` where `user`.col + 2 = 42", - "Table": "`user`" + "Query": "select `user`.col + 2 as a from `user` where `user`.col + 2 = 42" }, "TablesUsed": [ "user.user" @@ -4480,8 +4297,7 @@ "Sharded": false }, "FieldQuery": "select col + 2 as a from unsharded where 1 != 1", - "Query": "select col + 2 as a from unsharded having a = 42", - "Table": "unsharded" + "Query": "select col + 2 as a from unsharded having a = 42" }, "TablesUsed": [ "main.unsharded" @@ -4504,7 +4320,6 @@ }, "FieldQuery": "select id from `user` where 1 != 1", "Query": "select id from `user` where id = 5 and (`name` = 'apa' or foo = 'bar')", - "Table": "`user`", "Values": [ "5" ], @@ -4531,7 +4346,6 @@ }, "FieldQuery": "select id from `user` where 1 != 1", "Query": "select id from `user` where id in ::__vals and (id = 5 or `name` = 'bar') and (`name` = 'foo' or id = 12) and `name` in ('foo', 'bar')", - "Table": "`user`", "Values": [ "(5, 12)" ], @@ -4574,7 +4388,6 @@ "JoinVars": { "a_textcol1": 1 }, - "TableName": "`user`_`user`", "Inputs": [ { "OperatorType": "Route", @@ -4585,8 +4398,7 @@ }, "FieldQuery": "select sum(a.id), a.textcol1 from `user` as a where 1 != 1 group by a.textcol1", "OrderBy": "1 ASC COLLATE latin1_swedish_ci", - "Query": "select sum(a.id), a.textcol1 from `user` as a group by a.textcol1 order by a.textcol1 asc", - "Table": "`user`" + "Query": "select sum(a.id), a.textcol1 from `user` as a group by a.textcol1 order by a.textcol1 asc" }, { "OperatorType": "Route", @@ -4596,8 +4408,7 @@ "Sharded": true }, "FieldQuery": "select count(*) from `user` as b where 1 != 1 group by .0", - "Query": "select count(*) from `user` as b where b.textcol2 = :a_textcol1 /* VARCHAR */ group by .0", - "Table": "`user`" + "Query": "select count(*) from `user` as b where b.textcol2 = :a_textcol1 /* VARCHAR */ group by .0" } ] } @@ -4628,8 +4439,7 @@ "Sharded": true }, "FieldQuery": "select textcol1 from `user` where 1 != 1", - "Query": "select textcol1 from `user` where foo = 42", - "Table": "`user`" + "Query": "select textcol1 from `user` where foo = 42" }, "TablesUsed": [ "user.user" @@ -4647,7 +4457,6 @@ "OperatorType": "Join", "Variant": "Join", "JoinColumnIndexes": "L:0", - "TableName": "unsharded_`user`_unsharded", "Inputs": [ { "OperatorType": "Route", @@ -4657,15 +4466,13 @@ "Sharded": false }, "FieldQuery": "select 1 from unsharded where 1 != 1", - "Query": "select 1 from unsharded", - "Table": "unsharded" + "Query": "select 1 from unsharded" }, { "OperatorType": "SemiJoin", "JoinVars": { "u1_bar": 0 }, - "TableName": "`user`_unsharded", "Inputs": [ { "InputName": "Outer", @@ -4676,8 +4483,7 @@ "Sharded": true }, "FieldQuery": "select u1.bar from `user` as u1 where 1 != 1", - "Query": "select u1.bar from `user` as u1", - "Table": "`user`" + "Query": "select u1.bar from `user` as u1" }, { "InputName": "SubQuery", @@ -4688,8 +4494,7 @@ "Sharded": false }, "FieldQuery": "select 1 from unsharded as u2 where 1 != 1", - "Query": "select 1 from unsharded as u2 where u2.baz = :u1_bar limit 1", - "Table": "unsharded" + "Query": "select 1 from unsharded as u2 where u2.baz = :u1_bar limit 1" } ] } @@ -4733,7 +4538,6 @@ "JoinVars": { "user_id": 1 }, - "TableName": "`user`_user_extra", "Inputs": [ { "OperatorType": "Route", @@ -4743,8 +4547,7 @@ "Sharded": true }, "FieldQuery": "select count(*), `user`.id from `user` where 1 != 1 group by `user`.id", - "Query": "select count(*), `user`.id from `user` group by `user`.id", - "Table": "`user`" + "Query": "select count(*), `user`.id from `user` group by `user`.id" }, { "OperatorType": "Route", @@ -4754,8 +4557,7 @@ "Sharded": true }, "FieldQuery": "select count(*), user_extra.collections_status from user_extra where 1 != 1 group by user_extra.collections_status", - "Query": "select count(*), user_extra.collections_status from user_extra where user_extra.bar = :user_id group by user_extra.collections_status", - "Table": "user_extra" + "Query": "select count(*), user_extra.collections_status from user_extra where user_extra.bar = :user_id group by user_extra.collections_status" } ] } @@ -4793,8 +4595,7 @@ "FieldQuery": "select 1, ts, weight_string(ts) from `user` where 1 != 1", "OrderBy": "(1|2) ASC", "Query": "select 1, ts, weight_string(ts) from `user` where shard_key = 1 and is_removed = 1 and cmd in ('A', 'B', 'C') and (not user_id = 1 or not user_id is not null or not ts >= 1 or not ts <= 2) and (not user_id = 1 or not user_id is not null or not ts >= 12 or not ts <= 13) and (not user_id = 1 or not user_id is not null or not ts >= 14 or not ts <= 15) and (not user_id = 1 or not user_id is not null or not ts >= 16 or not ts <= 17) and (not user_id = 1 or not user_id is not null or not ts >= 18 or not ts <= 19) and (not user_id = 1 or not user_id is not null or not ts >= 110 or not ts <= 111) and (not user_id = 1 or not user_id is not null or not ts >= 112 or not ts <= 113) and (not user_id = 1 or not user_id is not null or not ts >= 114 or not ts <= 115) and (not user_id = 1 or not user_id is not null or not ts >= 116 or not ts <= 117) and (not user_id = 1 or not user_id is not null or not ts >= 118 or not ts <= 119) and (not user_id = 1 or not user_id is not null or not ts >= 120 or not ts <= 121) and (not user_id = 1 or not user_id is not null or not ts >= 122 or not ts <= 123) and (not user_id = 1 or not user_id is not null or not ts >= 124 or not ts <= 125) and (not user_id = 1 or not user_id is not null or not ts >= 126 or not ts <= 127) and (not user_id = 1 or not user_id is not null or not ts >= 128 or not ts <= 129) and (not user_id = 1 or not user_id is not null or not ts >= 130 or not ts <= 131) and (not user_id = 1 or not user_id is not null or not ts >= 132 or not ts <= 133) and (not user_id = 1 or not user_id is not null or not ts >= 134 or not ts <= 135) and (not user_id = 1 or not user_id is not null or not ts >= 136 or not ts <= 137) and (not user_id = 1 or not user_id is not null or not ts >= 138 or not ts <= 139) and (not user_id = 1 or not user_id is not null or not ts >= 140 or not ts <= 141) and (not user_id = 1 or not user_id is not null or not ts >= 142 or not ts <= 143) and (not user_id = 1 or not user_id is not null or not ts >= 144 or not ts <= 145) and (not user_id = 1 or not user_id is not null or not ts >= 146 or not ts <= 147) and (not user_id = 1 or not user_id is not null or not ts >= 148 or not ts <= 149) and (not user_id = 1 or not user_id is not null or not ts >= 150 or not ts <= 151) and (not user_id = 1 or not user_id is not null or not ts >= 152 or not ts <= 153) and (not user_id = 1 or not user_id is not null or not ts >= 154 or not ts <= 155) and (not user_id = 1 or not user_id is not null or not ts >= 156 or not ts <= 157) and (not user_id = 1 or not user_id is not null or not ts >= 158 or not ts <= 159) and (not user_id = 1 or not user_id is not null or not ts >= 160 or not ts <= 161) and (not user_id = 1 or not user_id is not null or not ts >= 162 or not ts <= 163) and (not user_id = 1 or not user_id is not null or not ts >= 164 or not ts <= 165) and (not user_id = 1 or not user_id is not null or not ts >= 166 or not ts <= 167) and (not user_id = 1 or not user_id is not null or not ts >= 168 or not ts <= 169) and (not user_id = 1 or not user_id is not null or not ts >= 170 or not ts <= 171) and (not user_id = 1 or not user_id is not null or not ts >= 172 or not ts <= 173) and (not user_id = 1 or not user_id is not null or not ts >= 174 or not ts <= 175) and (not user_id = 1 or not user_id is not null or not ts >= 176 or not ts <= 177) and (not user_id = 1 or not user_id is not null or not ts >= 178 or not ts <= 179) and (not user_id = 1 or not user_id is not null or not ts >= 180 or not ts <= 181) and (not user_id = 1 or not user_id is not null or not ts >= 182 or not ts <= 183) and (not user_id = 1 or not user_id is not null or not ts >= 184 or not ts <= 185) and (not user_id = 1 or not user_id is not null or not ts >= 186 or not ts <= 187) and (not user_id = 1 or not user_id is not null or not ts >= 188 or not ts <= 189) and (not user_id = 1 or not user_id is not null or not ts >= 190 or not ts <= 191) and (not user_id = 1 or not user_id is not null or not ts >= 192 or not ts <= 193) and (not user_id = 1 or not user_id is not null or not ts >= 194 or not ts <= 195) and (not user_id = 1 or not user_id is not null or not ts >= 196 or not ts <= 197) and (not user_id = 1 or not user_id is not null or not ts >= 198 or not ts <= 199) and (not user_id = 1 or not user_id is not null or not ts >= 1100 or not ts <= 1101) and (not user_id = 1 or not user_id is not null or not ts >= 1102 or not ts <= 1103) and (not user_id = 1 or not user_id is not null or not ts >= 1104 or not ts <= 1105) and (not user_id = 1 or not user_id is not null or not ts >= 1106 or not ts <= 1107) and (not user_id = 1 or not user_id is not null or not ts >= 1108 or not ts <= 1109) and (not user_id = 1 or not user_id is not null or not ts >= 1110 or not ts <= 1111) and (not user_id = 1 or not user_id is not null or not ts >= 1112 or not ts <= 1113) and (not user_id = 1 or not user_id is not null or not ts >= 1114 or not ts <= 1115) and (not user_id = 1 or not user_id is not null or not ts >= 1116 or not ts <= 1117) and (not user_id = 1 or not user_id is not null or not ts >= 1118 or not ts <= 1119) and (not user_id = 1 or not user_id is not null or not ts >= 1120 or not ts <= 1121) and (not user_id = 1 or not user_id is not null or not ts >= 1122 or not ts <= 1123) and (not user_id = 1 or not user_id is not null or not ts >= 1124 or not ts <= 1125) and (not user_id = 1 or not user_id is not null or not ts >= 1126 or not ts <= 1127) and (not user_id = 1 or not user_id is not null or not ts >= 1128 or not ts <= 1129) and (not user_id = 1 or not user_id is not null or not ts >= 1130 or not ts <= 1131) and (not user_id = 1 or not user_id is not null or not ts >= 1132 or not ts <= 1133) and (not user_id = 1 or not user_id is not null or not ts >= 1134 or not ts <= 1135) and (not user_id = 1 or not user_id is not null or not ts >= 1136 or not ts <= 1137) and (not user_id = 1 or not user_id is not null or not ts >= 1138 or not ts <= 1139) and (not user_id = 1 or not user_id is not null or not ts >= 1140 or not ts <= 1141) and (not user_id = 1 or not user_id is not null or not ts >= 1142 or not ts <= 1143) and (not user_id = 1 or not user_id is not null or not ts >= 1144 or not ts <= 1145) and (not user_id = 1 or not user_id is not null or not ts >= 1146 or not ts <= 1147) and (not user_id = 1 or not user_id is not null or not ts >= 1148 or not ts <= 1149) and (not user_id = 1 or not user_id is not null or not ts >= 1150 or not ts <= 1151) and (not user_id = 1 or not user_id is not null or not ts >= 1152 or not ts <= 1153) and (not user_id = 1 or not user_id is not null or not ts >= 1154 or not ts <= 1155) and (not user_id = 1 or not user_id is not null or not ts >= 1156 or not ts <= 1157) and (not user_id = 1 or not user_id is not null or not ts >= 1158 or not ts <= 1159) and (not user_id = 1 or not user_id is not null or not ts >= 1160 or not ts <= 1161) and (not user_id = 1 or not user_id is not null or not ts >= 1162 or not ts <= 1163) and (not user_id = 1 or not user_id is not null or not ts >= 1164 or not ts <= 1165) and (not user_id = 1 or not user_id is not null or not ts >= 1166 or not ts <= 1167) and (not user_id = 1 or not user_id is not null or not ts >= 1168 or not ts <= 1169) and (not user_id = 1 or not user_id is not null or not ts >= 1170 or not ts <= 1171) and (not user_id = 1 or not user_id is not null or not ts >= 1172 or not ts <= 1173) and (not user_id = 1 or not user_id is not null or not ts >= 1174 or not ts <= 1175) and (not user_id = 1 or not user_id is not null or not ts >= 1176 or not ts <= 1177) and (not user_id = 1 or not user_id is not null or not ts >= 1178 or not ts <= 1179) and (not user_id = 1 or not user_id is not null or not ts >= 1180 or not ts <= 1181) and (not user_id = 1 or not user_id is not null or not ts >= 1182 or not ts <= 1183) and (not user_id = 1 or not user_id is not null or not ts >= 1184 or not ts <= 1185) and (not user_id = 1 or not user_id is not null or not ts >= 1186 or not ts <= 1187) and (not user_id = 1 or not user_id is not null or not ts >= 1188 or not ts <= 1189) and (not user_id = 1 or not user_id is not null or not ts >= 1190 or not ts <= 1191) and (not user_id = 1 or not user_id is not null or not ts >= 1192 or not ts <= 1193) and (not user_id = 1 or not user_id is not null or not ts >= 1194 or not ts <= 1195) and (not user_id = 1 or not user_id is not null or not ts >= 1196 or not ts <= 1197) and (not user_id = 1 or not user_id is not null or not ts >= 1198 or not ts <= 1199) and (not user_id = 1 or not user_id is not null or not ts >= 1200 or not ts <= 1201) and (not user_id = 1 or not user_id is not null or not ts >= 1202 or not ts <= 1203) and (not user_id = 1 or not user_id is not null or not ts >= 1204 or not ts <= 1205) and (not user_id = 1 or not user_id is not null or not ts >= 1206 or not ts <= 1207) and (not user_id = 1 or not user_id is not null or not ts >= 1208 or not ts <= 1209) and (not user_id = 1 or not user_id is not null or not ts >= 1210 or not ts <= 1211) and (not user_id = 1 or not user_id is not null or not ts >= 1212 or not ts <= 1213) and (not user_id = 1 or not user_id is not null or not ts >= 1214 or not ts <= 1215) and (not user_id = 1 or not user_id is not null or not ts >= 1216 or not ts <= 1217) and (not user_id = 1 or not user_id is not null or not ts >= 1218 or not ts <= 1219) and (not user_id = 1 or not user_id is not null or not ts >= 1220 or not ts <= 1221) and (not user_id = 1 or not user_id is not null or not ts >= 1222 or not ts <= 1223) and (not user_id = 1 or not user_id is not null or not ts >= 1224 or not ts <= 1225) and (not user_id = 1 or not user_id is not null or not ts >= 1226 or not ts <= 1227) and (not user_id = 1 or not user_id is not null or not ts >= 1228 or not ts <= 1229) and (not user_id = 1 or not user_id is not null or not ts >= 1230 or not ts <= 1231) and (not user_id = 1 or not user_id is not null or not ts >= 1232 or not ts <= 1233) and (not user_id = 1 or not user_id is not null or not ts >= 1234 or not ts <= 1235) and (not user_id = 1 or not user_id is not null or not ts >= 1236 or not ts <= 1237) and (not user_id = 1 or not user_id is not null or not ts >= 1238 or not ts <= 1239) and (not user_id = 1 or not user_id is not null or not ts >= 1240 or not ts <= 1241) and (not user_id = 1 or not user_id is not null or not ts >= 1242 or not ts <= 1243) and (not user_id = 1 or not user_id is not null or not ts >= 1244 or not ts <= 1245) and (not user_id = 1 or not user_id is not null or not ts >= 1246 or not ts <= 1247) and (not user_id = 1 or not user_id is not null or not ts >= 1248 or not ts <= 1249) and (not user_id = 1 or not user_id is not null or not ts >= 1250 or not ts <= 1251) and (not user_id = 1 or not user_id is not null or not ts >= 1252 or not ts <= 1253) and (not user_id = 1 or not user_id is not null or not ts >= 1254 or not ts <= 1255) and (not user_id = 1 or not user_id is not null or not ts >= 1256 or not ts <= 1257) and (not user_id = 1 or not user_id is not null or not ts >= 1258 or not ts <= 1259) and (not user_id = 1 or not user_id is not null or not ts >= 1260 or not ts <= 1261) and (not user_id = 1 or not user_id is not null or not ts >= 1262 or not ts <= 1263) and (not user_id = 1 or not user_id is not null or not ts >= 1264 or not ts <= 1265) and (not user_id = 1 or not user_id is not null or not ts >= 1266 or not ts <= 1267) and (not user_id = 1 or not user_id is not null or not ts >= 1268 or not ts <= 1269) and (not user_id = 1 or not user_id is not null or not ts >= 1270 or not ts <= 1271) and (not user_id = 1 or not user_id is not null or not ts >= 1272 or not ts <= 1273) and (not user_id = 1 or not user_id is not null or not ts >= 1274 or not ts <= 1275) and (not user_id = 1 or not user_id is not null or not ts >= 1276 or not ts <= 1277) and (not user_id = 1 or not user_id is not null or not ts >= 1278 or not ts <= 1279) and (not user_id = 1 or not user_id is not null or not ts >= 1280 or not ts <= 1281) and (not user_id = 1 or not user_id is not null or not ts >= 1282 or not ts <= 1283) and (not user_id = 1 or not user_id is not null or not ts >= 1284 or not ts <= 1285) and (not user_id = 1 or not user_id is not null or not ts >= 1286 or not ts <= 1287) and (not user_id = 1 or not user_id is not null or not ts >= 1288 or not ts <= 1289) and (not user_id = 1 or not user_id is not null or not ts >= 1290 or not ts <= 1291) and (not user_id = 1 or not user_id is not null or not ts >= 1292 or not ts <= 1293) and (not user_id = 1 or not user_id is not null or not ts >= 1294 or not ts <= 1295) and (not user_id = 1 or not user_id is not null or not ts >= 1296 or not ts <= 1297) and (not user_id = 1 or not user_id is not null or not ts >= 1298 or not ts <= 1299) and (not user_id = 1 or not user_id is not null or not ts >= 1300 or not ts <= 1301) and (not user_id = 1 or not user_id is not null or not ts >= 1302 or not ts <= 1303) and (not user_id = 1 or not user_id is not null or not ts >= 1304 or not ts <= 1305) and (not user_id = 1 or not user_id is not null or not ts >= 1306 or not ts <= 1307) and (not user_id = 1 or not user_id is not null or not ts >= 1308 or not ts <= 1309) and (not user_id = 1 or not user_id is not null or not ts >= 1310 or not ts <= 1311) and (not user_id = 1 or not user_id is not null or not ts >= 1312 or not ts <= 1313) and (not user_id = 1 or not user_id is not null or not ts >= 1314 or not ts <= 1315) and (not user_id = 1 or not user_id is not null or not ts >= 1316 or not ts <= 1317) and (not user_id = 1 or not user_id is not null or not ts >= 1318 or not ts <= 1319) and (not user_id = 1 or not user_id is not null or not ts >= 1320 or not ts <= 1321) and (not user_id = 1 or not user_id is not null or not ts >= 1322 or not ts <= 1323) and (not user_id = 1 or not user_id is not null or not ts >= 1324 or not ts <= 1325) and (not user_id = 1 or not user_id is not null or not ts >= 1326 or not ts <= 1327) and (not user_id = 1 or not user_id is not null or not ts >= 1328 or not ts <= 1329) and (not user_id = 1 or not user_id is not null or not ts >= 1330 or not ts <= 1331) and (not user_id = 1 or not user_id is not null or not ts >= 1332 or not ts <= 1333) and (not user_id = 1 or not user_id is not null or not ts >= 1334 or not ts <= 1335) and (not user_id = 1 or not user_id is not null or not ts >= 1336 or not ts <= 1337) and (not user_id = 1 or not user_id is not null or not ts >= 1338 or not ts <= 1339) and (not user_id = 1 or not user_id is not null or not ts >= 1340 or not ts <= 1341) and (not user_id = 1 or not user_id is not null or not ts >= 1342 or not ts <= 1343) and (not user_id = 1 or not user_id is not null or not ts >= 1344 or not ts <= 1345) and (not user_id = 1 or not user_id is not null or not ts >= 1346 or not ts <= 1347) and (not user_id = 1 or not user_id is not null or not ts >= 1348 or not ts <= 1349) and (not user_id = 1 or not user_id is not null or not ts >= 1350 or not ts <= 1351) and (not user_id = 1 or not user_id is not null or not ts >= 1352 or not ts <= 1353) and (not user_id = 1 or not user_id is not null or not ts >= 1354 or not ts <= 1355) and (not user_id = 1 or not user_id is not null or not ts >= 1356 or not ts <= 1357) and (not user_id = 1 or not user_id is not null or not ts >= 1358 or not ts <= 1359) and (not user_id = 1 or not user_id is not null or not ts >= 1360 or not ts <= 1361) and (not user_id = 1 or not user_id is not null or not ts >= 1362 or not ts <= 1363) and (not user_id = 1 or not user_id is not null or not ts >= 1364 or not ts <= 1365) and (not user_id = 1 or not user_id is not null or not ts >= 1366 or not ts <= 1367) and (not user_id = 1 or not user_id is not null or not ts >= 1368 or not ts <= 1369) and (not user_id = 1 or not user_id is not null or not ts >= 1370 or not ts <= 1371) and (not user_id = 1 or not user_id is not null or not ts >= 1372 or not ts <= 1373) and (not user_id = 1 or not user_id is not null or not ts >= 1374 or not ts <= 1375) and (not user_id = 1 or not user_id is not null or not ts >= 1376 or not ts <= 1377) and (not user_id = 1 or not user_id is not null or not ts >= 1378 or not ts <= 1379) and (not user_id = 1 or not user_id is not null or not ts >= 1380 or not ts <= 1381) and (not user_id = 1 or not user_id is not null or not ts >= 1382 or not ts <= 1383) and (not user_id = 1 or not user_id is not null or not ts >= 1384 or not ts <= 1385) and (not user_id = 1 or not user_id is not null or not ts >= 1386 or not ts <= 1387) and (not user_id = 1 or not user_id is not null or not ts >= 1388 or not ts <= 1389) and (not user_id = 1 or not user_id is not null or not ts >= 1390 or not ts <= 1391) and (not user_id = 1 or not user_id is not null or not ts >= 1392 or not ts <= 1393) and (not user_id = 1 or not user_id is not null or not ts >= 1394 or not ts <= 1395) and (not user_id = 1 or not user_id is not null or not ts >= 1396 or not ts <= 1397) and (not user_id = 1 or not user_id is not null or not ts >= 1398 or not ts <= 1399) and (not user_id = 1 or not user_id is not null or not ts >= 1400 or not ts <= 1401) and (not user_id = 1 or not user_id is not null or not ts >= 1402 or not ts <= 1403) and (not user_id = 1 or not user_id is not null or not ts >= 1404 or not ts <= 1405) and (not user_id = 1 or not user_id is not null or not ts >= 1406 or not ts <= 1407) and (not user_id = 1 or not user_id is not null or not ts >= 1408 or not ts <= 1409) and (not user_id = 1 or not user_id is not null or not ts >= 1410 or not ts <= 1411) and (not user_id = 1 or not user_id is not null or not ts >= 1412 or not ts <= 1413) and (not user_id = 1 or not user_id is not null or not ts >= 1414 or not ts <= 1415) and (not user_id = 1 or not user_id is not null or not ts >= 1416 or not ts <= 1417) and (not user_id = 1 or not user_id is not null or not ts >= 1418 or not ts <= 1419) and (not user_id = 1 or not user_id is not null or not ts >= 1420 or not ts <= 1421) and (not user_id = 1 or not user_id is not null or not ts >= 1422 or not ts <= 1423) and (not user_id = 1 or not user_id is not null or not ts >= 1424 or not ts <= 1425) and (not user_id = 1 or not user_id is not null or not ts >= 1426 or not ts <= 1427) and (not user_id = 1 or not user_id is not null or not ts >= 1428 or not ts <= 1429) and (not user_id = 1 or not user_id is not null or not ts >= 1430 or not ts <= 1431) and (not user_id = 1 or not user_id is not null or not ts >= 1432 or not ts <= 1433) and (not user_id = 1 or not user_id is not null or not ts >= 1434 or not ts <= 1435) and (not user_id = 1 or not user_id is not null or not ts >= 1436 or not ts <= 1437) and (not user_id = 1 or not user_id is not null or not ts >= 1438 or not ts <= 1439) and (not user_id = 1 or not user_id is not null or not ts >= 1440 or not ts <= 1441) and (not user_id = 1 or not user_id is not null or not ts >= 1442 or not ts <= 1443) and (not user_id = 1 or not user_id is not null or not ts >= 1444 or not ts <= 1445) and (not user_id = 1 or not user_id is not null or not ts >= 1446 or not ts <= 1447) and (not user_id = 1 or not user_id is not null or not ts >= 1448 or not ts <= 1449) and (not user_id = 1 or not user_id is not null or not ts >= 1450 or not ts <= 1451) and (not user_id = 1 or not user_id is not null or not ts >= 1452 or not ts <= 1453) and (not user_id = 1 or not user_id is not null or not ts >= 1454 or not ts <= 1455) and (not user_id = 1 or not user_id is not null or not ts >= 1456 or not ts <= 1457) and (not user_id = 1 or not user_id is not null or not ts >= 1458 or not ts <= 1459) and (not user_id = 1 or not user_id is not null or not ts >= 1460 or not ts <= 1461) and (not user_id = 1 or not user_id is not null or not ts >= 1462 or not ts <= 1463) and (not user_id = 1 or not user_id is not null or not ts >= 1464 or not ts <= 1465) and (not user_id = 1 or not user_id is not null or not ts >= 1466 or not ts <= 1467) and (not user_id = 1 or not user_id is not null or not ts >= 1468 or not ts <= 1469) and (not user_id = 1 or not user_id is not null or not ts >= 1470 or not ts <= 1471) and (not user_id = 1 or not user_id is not null or not ts >= 1472 or not ts <= 1473) and (not user_id = 1 or not user_id is not null or not ts >= 1474 or not ts <= 1475) and (not user_id = 1 or not user_id is not null or not ts >= 1476 or not ts <= 1477) and (not user_id = 1 or not user_id is not null or not ts >= 1478 or not ts <= 1479) and (not user_id = 1 or not user_id is not null or not ts >= 1480 or not ts <= 1481) and (not user_id = 1 or not user_id is not null or not ts >= 1482 or not ts <= 1483) and (not user_id = 1 or not user_id is not null or not ts >= 1484 or not ts <= 1485) and (not user_id = 1 or not user_id is not null or not ts >= 1486 or not ts <= 1487) and (not user_id = 1 or not user_id is not null or not ts >= 1488 or not ts <= 1489) and (not user_id = 1 or not user_id is not null or not ts >= 1490 or not ts <= 1491) and (not user_id = 1 or not user_id is not null or not ts >= 1492 or not ts <= 1493) and (not user_id = 1 or not user_id is not null or not ts >= 1494 or not ts <= 1495) and (not user_id = 1 or not user_id is not null or not ts >= 1496 or not ts <= 1497) and (not user_id = 1 or not user_id is not null or not ts >= 1498 or not ts <= 1499) and (not user_id = 1 or not user_id is not null or not ts >= 1500 or not ts <= 1501) and (not user_id = 1 or not user_id is not null or not ts >= 1502 or not ts <= 1503) and (not user_id = 1 or not user_id is not null or not ts >= 1504 or not ts <= 1505) and (not user_id = 1 or not user_id is not null or not ts >= 1506 or not ts <= 1507) and (not user_id = 1 or not user_id is not null or not ts >= 1508 or not ts <= 1509) and (not user_id = 1 or not user_id is not null or not ts >= 1510 or not ts <= 1511) and (not user_id = 1 or not user_id is not null or not ts >= 1512 or not ts <= 1513) and (not user_id = 1 or not user_id is not null or not ts >= 1514 or not ts <= 1515) and (not user_id = 1 or not user_id is not null or not ts >= 1516 or not ts <= 1517) and (not user_id = 1 or not user_id is not null or not ts >= 1518 or not ts <= 1519) and (not user_id = 1 or not user_id is not null or not ts >= 1520 or not ts <= 1521) and (not user_id = 1 or not user_id is not null or not ts >= 1522 or not ts <= 1523) and (not user_id = 1 or not user_id is not null or not ts >= 1524 or not ts <= 1525) and (not user_id = 1 or not user_id is not null or not ts >= 1526 or not ts <= 1527) and (not user_id = 1 or not user_id is not null or not ts >= 1528 or not ts <= 1529) and (not user_id = 1 or not user_id is not null or not ts >= 1530 or not ts <= 1531) and (not user_id = 1 or not user_id is not null or not ts >= 1532 or not ts <= 1533) and (not user_id = 1 or not user_id is not null or not ts >= 1534 or not ts <= 1535) and (not user_id = 1 or not user_id is not null or not ts >= 1536 or not ts <= 1537) and (not user_id = 1 or not user_id is not null or not ts >= 1538 or not ts <= 1539) and (not user_id = 1 or not user_id is not null or not ts >= 1540 or not ts <= 1541) and (not user_id = 1 or not user_id is not null or not ts >= 1542 or not ts <= 1543) and (not user_id = 1 or not user_id is not null or not ts >= 1544 or not ts <= 1545) and (not user_id = 1 or not user_id is not null or not ts >= 1546 or not ts <= 1547) and (not user_id = 1 or not user_id is not null or not ts >= 1548 or not ts <= 1549) and (not user_id = 1 or not user_id is not null or not ts >= 1550 or not ts <= 1551) and (not user_id = 1 or not user_id is not null or not ts >= 1552 or not ts <= 1553) and (not user_id = 1 or not user_id is not null or not ts >= 1554 or not ts <= 1555) and (not user_id = 1 or not user_id is not null or not ts >= 1556 or not ts <= 1557) and (not user_id = 1 or not user_id is not null or not ts >= 1558 or not ts <= 1559) and (not user_id = 1 or not user_id is not null or not ts >= 1560 or not ts <= 1561) and (not user_id = 1 or not user_id is not null or not ts >= 1562 or not ts <= 1563) and (not user_id = 1 or not user_id is not null or not ts >= 1564 or not ts <= 1565) and (not user_id = 1 or not user_id is not null or not ts >= 1566 or not ts <= 1567) and (not user_id = 1 or not user_id is not null or not ts >= 1568 or not ts <= 1569) and (not user_id = 1 or not user_id is not null or not ts >= 1570 or not ts <= 1571) and (not user_id = 1 or not user_id is not null or not ts >= 1572 or not ts <= 1573) and (not user_id = 1 or not user_id is not null or not ts >= 1574 or not ts <= 1575) and (not user_id = 1 or not user_id is not null or not ts >= 1576 or not ts <= 1577) and (not user_id = 1 or not user_id is not null or not ts >= 1578 or not ts <= 1579) and (not user_id = 1 or not user_id is not null or not ts >= 1580 or not ts <= 1581) and (not user_id = 1 or not user_id is not null or not ts >= 1582 or not ts <= 1583) and (not user_id = 1 or not user_id is not null or not ts >= 1584 or not ts <= 1585) and (not user_id = 1 or not user_id is not null or not ts >= 1586 or not ts <= 1587) and (not user_id = 1 or not user_id is not null or not ts >= 1588 or not ts <= 1589) and (not user_id = 1 or not user_id is not null or not ts >= 1590 or not ts <= 1591) and (not user_id = 1 or not user_id is not null or not ts >= 1592 or not ts <= 1593) and (not user_id = 1 or not user_id is not null or not ts >= 1594 or not ts <= 1595) and (not user_id = 1 or not user_id is not null or not ts >= 1596 or not ts <= 1597) and (not user_id = 1 or not user_id is not null or not ts >= 1598 or not ts <= 1599) and (not user_id = 1 or not user_id is not null or not ts >= 1600 or not ts <= 1601) and (not user_id = 1 or not user_id is not null or not ts >= 1602 or not ts <= 1603) and (not user_id = 1 or not user_id is not null or not ts >= 1604 or not ts <= 1605) and (not user_id = 1 or not user_id is not null or not ts >= 1606 or not ts <= 1607) and (not user_id = 1 or not user_id is not null or not ts >= 1608 or not ts <= 1609) and (not user_id = 1 or not user_id is not null or not ts >= 1610 or not ts <= 1611) and (not user_id = 1 or not user_id is not null or not ts >= 1612 or not ts <= 1613) and (not user_id = 1 or not user_id is not null or not ts >= 1614 or not ts <= 1615) and (not user_id = 1 or not user_id is not null or not ts >= 1616 or not ts <= 1617) and (not user_id = 1 or not user_id is not null or not ts >= 1618 or not ts <= 1619) and (not user_id = 1 or not user_id is not null or not ts >= 1620 or not ts <= 1621) and (not user_id = 1 or not user_id is not null or not ts >= 1622 or not ts <= 1623) and (not user_id = 1 or not user_id is not null or not ts >= 1624 or not ts <= 1625) and (not user_id = 1 or not user_id is not null or not ts >= 1626 or not ts <= 1627) and (not user_id = 1 or not user_id is not null or not ts >= 1628 or not ts <= 1629) and (not user_id = 1 or not user_id is not null or not ts >= 1630 or not ts <= 1631) and (not user_id = 1 or not user_id is not null or not ts >= 1632 or not ts <= 1633) and (not user_id = 1 or not user_id is not null or not ts >= 1634 or not ts <= 1635) and (not user_id = 1 or not user_id is not null or not ts >= 1636 or not ts <= 1637) and (not user_id = 1 or not user_id is not null or not ts >= 1638 or not ts <= 1639) and (not user_id = 1 or not user_id is not null or not ts >= 1640 or not ts <= 1641) and (not user_id = 1 or not user_id is not null or not ts >= 1642 or not ts <= 1643) and (not user_id = 1 or not user_id is not null or not ts >= 1644 or not ts <= 1645) and (not user_id = 1 or not user_id is not null or not ts >= 1646 or not ts <= 1647) and (not user_id = 1 or not user_id is not null or not ts >= 1648 or not ts <= 1649) and (not user_id = 1 or not user_id is not null or not ts >= 1650 or not ts <= 1651) and (not user_id = 1 or not user_id is not null or not ts >= 1652 or not ts <= 1653) and (not user_id = 1 or not user_id is not null or not ts >= 1654 or not ts <= 1655) and (not user_id = 1 or not user_id is not null or not ts >= 1656 or not ts <= 1657) and (not user_id = 1 or not user_id is not null or not ts >= 1658 or not ts <= 1659) and (not user_id = 1 or not user_id is not null or not ts >= 1660 or not ts <= 1661) and (not user_id = 1 or not user_id is not null or not ts >= 1662 or not ts <= 1663) and (not user_id = 1 or not user_id is not null or not ts >= 1664 or not ts <= 1665) and (not user_id = 1 or not user_id is not null or not ts >= 1666 or not ts <= 1667) and (not user_id = 1 or not user_id is not null or not ts >= 1668 or not ts <= 1669) and (not user_id = 1 or not user_id is not null or not ts >= 1670 or not ts <= 1671) and (not user_id = 1 or not user_id is not null or not ts >= 1672 or not ts <= 1673) and (not user_id = 1 or not user_id is not null or not ts >= 1674 or not ts <= 1675) and (not user_id = 1 or not user_id is not null or not ts >= 1676 or not ts <= 1677) and (not user_id = 1 or not user_id is not null or not ts >= 1678 or not ts <= 1679) and (not user_id = 1 or not user_id is not null or not ts >= 1680 or not ts <= 1681) and (not user_id = 1 or not user_id is not null or not ts >= 1682 or not ts <= 1683) and (not user_id = 1 or not user_id is not null or not ts >= 1684 or not ts <= 1685) and (not user_id = 1 or not user_id is not null or not ts >= 1686 or not ts <= 1687) and (not user_id = 1 or not user_id is not null or not ts >= 1688 or not ts <= 1689) and (not user_id = 1 or not user_id is not null or not ts >= 1690 or not ts <= 1691) and (not user_id = 1 or not user_id is not null or not ts >= 1692 or not ts <= 1693) and (not user_id = 1 or not user_id is not null or not ts >= 1694 or not ts <= 1695) and (not user_id = 1 or not user_id is not null or not ts >= 1696 or not ts <= 1697) and (not user_id = 1 or not user_id is not null or not ts >= 1698 or not ts <= 1699) and (not user_id = 1 or not user_id is not null or not ts >= 1700 or not ts <= 1701) and (not user_id = 1 or not user_id is not null or not ts >= 1702 or not ts <= 1703) and (not user_id = 1 or not user_id is not null or not ts >= 1704 or not ts <= 1705) and (not user_id = 1 or not user_id is not null or not ts >= 1706 or not ts <= 1707) and (not user_id = 1 or not user_id is not null or not ts >= 1708 or not ts <= 1709) and (not user_id = 1 or not user_id is not null or not ts >= 1710 or not ts <= 1711) and (not user_id = 1 or not user_id is not null or not ts >= 1712 or not ts <= 1713) and (not user_id = 1 or not user_id is not null or not ts >= 1714 or not ts <= 1715) and (not user_id = 1 or not user_id is not null or not ts >= 1716 or not ts <= 1717) and (not user_id = 1 or not user_id is not null or not ts >= 1718 or not ts <= 1719) and (not user_id = 1 or not user_id is not null or not ts >= 1720 or not ts <= 1721) and (not user_id = 1 or not user_id is not null or not ts >= 1722 or not ts <= 1723) and (not user_id = 1 or not user_id is not null or not ts >= 1724 or not ts <= 1725) and (not user_id = 1 or not user_id is not null or not ts >= 1726 or not ts <= 1727) and (not user_id = 1 or not user_id is not null or not ts >= 1728 or not ts <= 1729) and (not user_id = 1 or not user_id is not null or not ts >= 1730 or not ts <= 1731) and (not user_id = 1 or not user_id is not null or not ts >= 1732 or not ts <= 1733) and (not user_id = 1 or not user_id is not null or not ts >= 1734 or not ts <= 1735) and (not user_id = 1 or not user_id is not null or not ts >= 1736 or not ts <= 1737) and (not user_id = 1 or not user_id is not null or not ts >= 1738 or not ts <= 1739) and (not user_id = 1 or not user_id is not null or not ts >= 1740 or not ts <= 1741) and (not user_id = 1 or not user_id is not null or not ts >= 1742 or not ts <= 1743) and (not user_id = 1 or not user_id is not null or not ts >= 1744 or not ts <= 1745) and (not user_id = 1 or not user_id is not null or not ts >= 1746 or not ts <= 1747) and (not user_id = 1 or not user_id is not null or not ts >= 1748 or not ts <= 1749) and (not user_id = 1 or not user_id is not null or not ts >= 1750 or not ts <= 1751) and (not user_id = 1 or not user_id is not null or not ts >= 1752 or not ts <= 1753) and (not user_id = 1 or not user_id is not null or not ts >= 1754 or not ts <= 1755) and (not user_id = 1 or not user_id is not null or not ts >= 1756 or not ts <= 1757) and (not user_id = 1 or not user_id is not null or not ts >= 1758 or not ts <= 1759) and (not user_id = 1 or not user_id is not null or not ts >= 1760 or not ts <= 1761) and (not user_id = 1 or not user_id is not null or not ts >= 1762 or not ts <= 1763) and (not user_id = 1 or not user_id is not null or not ts >= 1764 or not ts <= 1765) and (not user_id = 1 or not user_id is not null or not ts >= 1766 or not ts <= 1767) and (not user_id = 1 or not user_id is not null or not ts >= 1768 or not ts <= 1769) and (not user_id = 1 or not user_id is not null or not ts >= 1770 or not ts <= 1771) and (not user_id = 1 or not user_id is not null or not ts >= 1772 or not ts <= 1773) and (not user_id = 1 or not user_id is not null or not ts >= 1774 or not ts <= 1775) and (not user_id = 1 or not user_id is not null or not ts >= 1776 or not ts <= 1777) and (not user_id = 1 or not user_id is not null or not ts >= 1778 or not ts <= 1779) and (not user_id = 1 or not user_id is not null or not ts >= 1780 or not ts <= 1781) and (not user_id = 1 or not user_id is not null or not ts >= 1782 or not ts <= 1783) and (not user_id = 1 or not user_id is not null or not ts >= 1784 or not ts <= 1785) and (not user_id = 1 or not user_id is not null or not ts >= 1786 or not ts <= 1787) and (not user_id = 1 or not user_id is not null or not ts >= 1788 or not ts <= 1789) and (not user_id = 1 or not user_id is not null or not ts >= 1790 or not ts <= 1791) and (not user_id = 1 or not user_id is not null or not ts >= 1792 or not ts <= 1793) and (not user_id = 1 or not user_id is not null or not ts >= 1794 or not ts <= 1795) and (not user_id = 1 or not user_id is not null or not ts >= 1796 or not ts <= 1797) and (not user_id = 1 or not user_id is not null or not ts >= 1798 or not ts <= 1799) and (not user_id = 1 or not user_id is not null or not ts >= 1800 or not ts <= 1801) and (not user_id = 1 or not user_id is not null or not ts >= 1802 or not ts <= 1803) and (not user_id = 1 or not user_id is not null or not ts >= 1804 or not ts <= 1805) and (not user_id = 1 or not user_id is not null or not ts >= 1806 or not ts <= 1807) and (not user_id = 1 or not user_id is not null or not ts >= 1808 or not ts <= 1809) and (not user_id = 1 or not user_id is not null or not ts >= 1810 or not ts <= 1811) and (not user_id = 1 or not user_id is not null or not ts >= 1812 or not ts <= 1813) and (not user_id = 1 or not user_id is not null or not ts >= 1814 or not ts <= 1815) and (not user_id = 1 or not user_id is not null or not ts >= 1816 or not ts <= 1817) and (not user_id = 1 or not user_id is not null or not ts >= 1818 or not ts <= 1819) and (not user_id = 1 or not user_id is not null or not ts >= 1820 or not ts <= 1821) and (not user_id = 1 or not user_id is not null or not ts >= 1822 or not ts <= 1823) and (not user_id = 1 or not user_id is not null or not ts >= 1824 or not ts <= 1825) and (not user_id = 1 or not user_id is not null or not ts >= 1826 or not ts <= 1827) and (not user_id = 1 or not user_id is not null or not ts >= 1828 or not ts <= 1829) and (not user_id = 1 or not user_id is not null or not ts >= 1830 or not ts <= 1831) and (not user_id = 1 or not user_id is not null or not ts >= 1832 or not ts <= 1833) and (not user_id = 1 or not user_id is not null or not ts >= 1834 or not ts <= 1835) and (not user_id = 1 or not user_id is not null or not ts >= 1836 or not ts <= 1837) and (not user_id = 1 or not user_id is not null or not ts >= 1838 or not ts <= 1839) and (not user_id = 1 or not user_id is not null or not ts >= 1840 or not ts <= 1841) and (not user_id = 1 or not user_id is not null or not ts >= 1842 or not ts <= 1843) and (not user_id = 1 or not user_id is not null or not ts >= 1844 or not ts <= 1845) and (not user_id = 1 or not user_id is not null or not ts >= 1846 or not ts <= 1847) and (not user_id = 1 or not user_id is not null or not ts >= 1848 or not ts <= 1849) and (not user_id = 1 or not user_id is not null or not ts >= 1850 or not ts <= 1851) and (not user_id = 1 or not user_id is not null or not ts >= 1852 or not ts <= 1853) and (not user_id = 1 or not user_id is not null or not ts >= 1854 or not ts <= 1855) and (not user_id = 1 or not user_id is not null or not ts >= 1856 or not ts <= 1857) and (not user_id = 1 or not user_id is not null or not ts >= 1858 or not ts <= 1859) and (not user_id = 1 or not user_id is not null or not ts >= 1860 or not ts <= 1861) and (not user_id = 1 or not user_id is not null or not ts >= 1862 or not ts <= 1863) and (not user_id = 1 or not user_id is not null or not ts >= 1864 or not ts <= 1865) and (not user_id = 1 or not user_id is not null or not ts >= 1866 or not ts <= 1867) and (not user_id = 1 or not user_id is not null or not ts >= 1868 or not ts <= 1869) and (not user_id = 1 or not user_id is not null or not ts >= 1870 or not ts <= 1871) and (not user_id = 1 or not user_id is not null or not ts >= 1872 or not ts <= 1873) and (not user_id = 1 or not user_id is not null or not ts >= 1874 or not ts <= 1875) and (not user_id = 1 or not user_id is not null or not ts >= 1876 or not ts <= 1877) and (not user_id = 1 or not user_id is not null or not ts >= 1878 or not ts <= 1879) and (not user_id = 1 or not user_id is not null or not ts >= 1880 or not ts <= 1881) and (not user_id = 1 or not user_id is not null or not ts >= 1882 or not ts <= 1883) and (not user_id = 1 or not user_id is not null or not ts >= 1884 or not ts <= 1885) and (not user_id = 1 or not user_id is not null or not ts >= 1886 or not ts <= 1887) and (not user_id = 1 or not user_id is not null or not ts >= 1888 or not ts <= 1889) and (not user_id = 1 or not user_id is not null or not ts >= 1890 or not ts <= 1891) and (not user_id = 1 or not user_id is not null or not ts >= 1892 or not ts <= 1893) and (not user_id = 1 or not user_id is not null or not ts >= 1894 or not ts <= 1895) and (not user_id = 1 or not user_id is not null or not ts >= 1896 or not ts <= 1897) and (not user_id = 1 or not user_id is not null or not ts >= 1898 or not ts <= 1899) and (not user_id = 1 or not user_id is not null or not ts >= 1900 or not ts <= 1901) and (not user_id = 1 or not user_id is not null or not ts >= 1902 or not ts <= 1903) and (not user_id = 1 or not user_id is not null or not ts >= 1904 or not ts <= 1905) and (not user_id = 1 or not user_id is not null or not ts >= 1906 or not ts <= 1907) and (not user_id = 1 or not user_id is not null or not ts >= 1908 or not ts <= 1909) and (not user_id = 1 or not user_id is not null or not ts >= 1910 or not ts <= 1911) and (not user_id = 1 or not user_id is not null or not ts >= 1912 or not ts <= 1913) and (not user_id = 1 or not user_id is not null or not ts >= 1914 or not ts <= 1915) and (not user_id = 1 or not user_id is not null or not ts >= 1916 or not ts <= 1917) and (not user_id = 1 or not user_id is not null or not ts >= 1918 or not ts <= 1919) and (not user_id = 1 or not user_id is not null or not ts >= 1920 or not ts <= 1921) and (not user_id = 1 or not user_id is not null or not ts >= 1922 or not ts <= 1923) and (not user_id = 1 or not user_id is not null or not ts >= 1924 or not ts <= 1925) and (not user_id = 1 or not user_id is not null or not ts >= 1926 or not ts <= 1927) and (not user_id = 1 or not user_id is not null or not ts >= 1928 or not ts <= 1929) and (not user_id = 1 or not user_id is not null or not ts >= 1930 or not ts <= 1931) and (not user_id = 1 or not user_id is not null or not ts >= 1932 or not ts <= 1933) and (not user_id = 1 or not user_id is not null or not ts >= 1934 or not ts <= 1935) and (not user_id = 1 or not user_id is not null or not ts >= 1936 or not ts <= 1937) and (not user_id = 1 or not user_id is not null or not ts >= 1938 or not ts <= 1939) and (not user_id = 1 or not user_id is not null or not ts >= 1940 or not ts <= 1941) and (not user_id = 1 or not user_id is not null or not ts >= 1942 or not ts <= 1943) and (not user_id = 1 or not user_id is not null or not ts >= 1944 or not ts <= 1945) and (not user_id = 1 or not user_id is not null or not ts >= 1946 or not ts <= 1947) and (not user_id = 1 or not user_id is not null or not ts >= 1948 or not ts <= 1949) and (not user_id = 1 or not user_id is not null or not ts >= 1950 or not ts <= 1951) and (not user_id = 1 or not user_id is not null or not ts >= 1952 or not ts <= 1953) and (not user_id = 1 or not user_id is not null or not ts >= 1954 or not ts <= 1955) and (not user_id = 1 or not user_id is not null or not ts >= 1956 or not ts <= 1957) and (not user_id = 1 or not user_id is not null or not ts >= 1958 or not ts <= 1959) and (not user_id = 1 or not user_id is not null or not ts >= 1960 or not ts <= 1961) and (not user_id = 1 or not user_id is not null or not ts >= 1962 or not ts <= 1963) and (not user_id = 1 or not user_id is not null or not ts >= 1964 or not ts <= 1965) and (not user_id = 1 or not user_id is not null or not ts >= 1966 or not ts <= 1967) and (not user_id = 1 or not user_id is not null or not ts >= 1968 or not ts <= 1969) and (not user_id = 1 or not user_id is not null or not ts >= 1970 or not ts <= 1971) and (not user_id = 1 or not user_id is not null or not ts >= 1972 or not ts <= 1973) and (not user_id = 1 or not user_id is not null or not ts >= 1974 or not ts <= 1975) and (not user_id = 1 or not user_id is not null or not ts >= 1976 or not ts <= 1977) and (not user_id = 1 or not user_id is not null or not ts >= 1978 or not ts <= 1979) and (not user_id = 1 or not user_id is not null or not ts >= 1980 or not ts <= 1981) and (not user_id = 1 or not user_id is not null or not ts >= 1982 or not ts <= 1983) and (not user_id = 1 or not user_id is not null or not ts >= 1984 or not ts <= 1985) and (not user_id = 1 or not user_id is not null or not ts >= 1986 or not ts <= 1987) and (not user_id = 1 or not user_id is not null or not ts >= 1988 or not ts <= 1989) and (not user_id = 1 or not user_id is not null or not ts >= 1990 or not ts <= 1991) and (not user_id = 1 or not user_id is not null or not ts >= 1992 or not ts <= 1993) and (not user_id = 1 or not user_id is not null or not ts >= 1994 or not ts <= 1995) and (not user_id = 1 or not user_id is not null or not ts >= 1996 or not ts <= 1997) and (not user_id = 1 or not user_id is not null or not ts >= 1998 or not ts <= 1999) and (not user_id = 1 or not user_id is not null or not ts >= 11000 or not ts <= 11001) and (not user_id = 1 or not user_id is not null or not ts >= 11002 or not ts <= 11003) and (not user_id = 1 or not user_id is not null or not ts >= 11004 or not ts <= 11005) and (not user_id = 1 or not user_id is not null or not ts >= 11006 or not ts <= 11007) and (not user_id = 1 or not user_id is not null or not ts >= 11008 or not ts <= 11009) and (not user_id = 1 or not user_id is not null or not ts >= 11010 or not ts <= 11011) and (not user_id = 1 or not user_id is not null or not ts >= 11012 or not ts <= 11013) and (not user_id = 1 or not user_id is not null or not ts >= 11014 or not ts <= 11015) and (not user_id = 1 or not user_id is not null or not ts >= 11016 or not ts <= 11017) and (not user_id = 1 or not user_id is not null or not ts >= 11018 or not ts <= 11019) and (not user_id = 1 or not user_id is not null or not ts >= 11020 or not ts <= 11021) and (not user_id = 1 or not user_id is not null or not ts >= 11022 or not ts <= 11023) and (not user_id = 1 or not user_id is not null or not ts >= 11024 or not ts <= 11025) and (not user_id = 1 or not user_id is not null or not ts >= 11026 or not ts <= 11027) and (not user_id = 1 or not user_id is not null or not ts >= 11028 or not ts <= 11029) and (not user_id = 1 or not user_id is not null or not ts >= 11030 or not ts <= 11031) and (not user_id = 1 or not user_id is not null or not ts >= 11032 or not ts <= 11033) and (not user_id = 1 or not user_id is not null or not ts >= 11034 or not ts <= 11035) and (not user_id = 1 or not user_id is not null or not ts >= 11036 or not ts <= 11037) and (not user_id = 1 or not user_id is not null or not ts >= 11038 or not ts <= 11039) and (not user_id = 1 or not user_id is not null or not ts >= 11040 or not ts <= 11041) and (not user_id = 1 or not user_id is not null or not ts >= 11042 or not ts <= 11043) and (not user_id = 1 or not user_id is not null or not ts >= 11044 or not ts <= 11045) and (not user_id = 1 or not user_id is not null or not ts >= 11046 or not ts <= 11047) and (not user_id = 1 or not user_id is not null or not ts >= 11048 or not ts <= 11049) and (not user_id = 1 or not user_id is not null or not ts >= 11050 or not ts <= 11051) and (not user_id = 1 or not user_id is not null or not ts >= 11052 or not ts <= 11053) and (not user_id = 1 or not user_id is not null or not ts >= 11054 or not ts <= 11055) and (not user_id = 1 or not user_id is not null or not ts >= 11056 or not ts <= 11057) and (not user_id = 1 or not user_id is not null or not ts >= 11058 or not ts <= 11059) and (not user_id = 1 or not user_id is not null or not ts >= 11060 or not ts <= 11061) and (not user_id = 1 or not user_id is not null or not ts >= 11062 or not ts <= 11063) and (not user_id = 1 or not user_id is not null or not ts >= 11064 or not ts <= 11065) and (not user_id = 1 or not user_id is not null or not ts >= 11066 or not ts <= 11067) and (not user_id = 1 or not user_id is not null or not ts >= 11068 or not ts <= 11069) and (not user_id = 1 or not user_id is not null or not ts >= 11070 or not ts <= 11071) and (not user_id = 1 or not user_id is not null or not ts >= 11072 or not ts <= 11073) and (not user_id = 1 or not user_id is not null or not ts >= 11074 or not ts <= 11075) and (not user_id = 1 or not user_id is not null or not ts >= 11076 or not ts <= 11077) and (not user_id = 1 or not user_id is not null or not ts >= 11078 or not ts <= 11079) and (not user_id = 1 or not user_id is not null or not ts >= 11080 or not ts <= 11081) and (not user_id = 1 or not user_id is not null or not ts >= 11082 or not ts <= 11083) and (not user_id = 1 or not user_id is not null or not ts >= 11084 or not ts <= 11085) and (not user_id = 1 or not user_id is not null or not ts >= 11086 or not ts <= 11087) and (not user_id = 1 or not user_id is not null or not ts >= 11088 or not ts <= 11089) and (not user_id = 1 or not user_id is not null or not ts >= 11090 or not ts <= 11091) and (not user_id = 1 or not user_id is not null or not ts >= 11092 or not ts <= 11093) and (not user_id = 1 or not user_id is not null or not ts >= 11094 or not ts <= 11095) and (not user_id = 1 or not user_id is not null or not ts >= 11096 or not ts <= 11097) and (not user_id = 1 or not user_id is not null or not ts >= 11098 or not ts <= 11099) and (not user_id = 1 or not user_id is not null or not ts >= 11100 or not ts <= 11101) and (not user_id = 1 or not user_id is not null or not ts >= 11102 or not ts <= 11103) and (not user_id = 1 or not user_id is not null or not ts >= 11104 or not ts <= 11105) and (not user_id = 1 or not user_id is not null or not ts >= 11106 or not ts <= 11107) and (not user_id = 1 or not user_id is not null or not ts >= 11108 or not ts <= 11109) and (not user_id = 1 or not user_id is not null or not ts >= 11110 or not ts <= 11111) and (not user_id = 1 or not user_id is not null or not ts >= 11112 or not ts <= 11113) and (not user_id = 1 or not user_id is not null or not ts >= 11114 or not ts <= 11115) and (not user_id = 1 or not user_id is not null or not ts >= 11116 or not ts <= 11117) and (not user_id = 1 or not user_id is not null or not ts >= 11118 or not ts <= 11119) and (not user_id = 1 or not user_id is not null or not ts >= 11120 or not ts <= 11121) and (not user_id = 1 or not user_id is not null or not ts >= 11122 or not ts <= 11123) and (not user_id = 1 or not user_id is not null or not ts >= 11124 or not ts <= 11125) and (not user_id = 1 or not user_id is not null or not ts >= 11126 or not ts <= 11127) and (not user_id = 1 or not user_id is not null or not ts >= 11128 or not ts <= 11129) and (not user_id = 1 or not user_id is not null or not ts >= 11130 or not ts <= 11131) and (not user_id = 1 or not user_id is not null or not ts >= 11132 or not ts <= 11133) and (not user_id = 1 or not user_id is not null or not ts >= 11134 or not ts <= 11135) and (not user_id = 1 or not user_id is not null or not ts >= 11136 or not ts <= 11137) and (not user_id = 1 or not user_id is not null or not ts >= 11138 or not ts <= 11139) and (not user_id = 1 or not user_id is not null or not ts >= 11140 or not ts <= 11141) and (not user_id = 1 or not user_id is not null or not ts >= 11142 or not ts <= 11143) and (not user_id = 1 or not user_id is not null or not ts >= 11144 or not ts <= 11145) and (not user_id = 1 or not user_id is not null or not ts >= 11146 or not ts <= 11147) and (not user_id = 1 or not user_id is not null or not ts >= 11148 or not ts <= 11149) and (not user_id = 1 or not user_id is not null or not ts >= 11150 or not ts <= 11151) and (not user_id = 1 or not user_id is not null or not ts >= 11152 or not ts <= 11153) and (not user_id = 1 or not user_id is not null or not ts >= 11154 or not ts <= 11155) and (not user_id = 1 or not user_id is not null or not ts >= 11156 or not ts <= 11157) and (not user_id = 1 or not user_id is not null or not ts >= 11158 or not ts <= 11159) and (not user_id = 1 or not user_id is not null or not ts >= 11160 or not ts <= 11161) and (not user_id = 1 or not user_id is not null or not ts >= 11162 or not ts <= 11163) and (not user_id = 1 or not user_id is not null or not ts >= 11164 or not ts <= 11165) and (not user_id = 1 or not user_id is not null or not ts >= 11166 or not ts <= 11167) and (not user_id = 1 or not user_id is not null or not ts >= 11168 or not ts <= 11169) and (not user_id = 1 or not user_id is not null or not ts >= 11170 or not ts <= 11171) and (not user_id = 1 or not user_id is not null or not ts >= 11172 or not ts <= 11173) and (not user_id = 1 or not user_id is not null or not ts >= 11174 or not ts <= 11175) and (not user_id = 1 or not user_id is not null or not ts >= 11176 or not ts <= 11177) and (not user_id = 1 or not user_id is not null or not ts >= 11178 or not ts <= 11179) and (not user_id = 1 or not user_id is not null or not ts >= 11180 or not ts <= 11181) and (not user_id = 1 or not user_id is not null or not ts >= 11182 or not ts <= 11183) and (not user_id = 1 or not user_id is not null or not ts >= 11184 or not ts <= 11185) and (not user_id = 1 or not user_id is not null or not ts >= 11186 or not ts <= 11187) and (not user_id = 1 or not user_id is not null or not ts >= 11188 or not ts <= 11189) and (not user_id = 1 or not user_id is not null or not ts >= 11190 or not ts <= 11191) and (not user_id = 1 or not user_id is not null or not ts >= 11192 or not ts <= 11193) and (not user_id = 1 or not user_id is not null or not ts >= 11194 or not ts <= 11195) and (not user_id = 1 or not user_id is not null or not ts >= 11196 or not ts <= 11197) and (not user_id = 1 or not user_id is not null or not ts >= 11198 or not ts <= 11199) and (not user_id = 1 or not user_id is not null or not ts >= 11200 or not ts <= 11201) and (not user_id = 1 or not user_id is not null or not ts >= 11202 or not ts <= 11203) and (not user_id = 1 or not user_id is not null or not ts >= 11204 or not ts <= 11205) and (not user_id = 1 or not user_id is not null or not ts >= 11206 or not ts <= 11207) and (not user_id = 1 or not user_id is not null or not ts >= 11208 or not ts <= 11209) and (not user_id = 1 or not user_id is not null or not ts >= 11210 or not ts <= 11211) and (not user_id = 1 or not user_id is not null or not ts >= 11212 or not ts <= 11213) and (not user_id = 1 or not user_id is not null or not ts >= 11214 or not ts <= 11215) and (not user_id = 1 or not user_id is not null or not ts >= 11216 or not ts <= 11217) and (not user_id = 1 or not user_id is not null or not ts >= 11218 or not ts <= 11219) and (not user_id = 1 or not user_id is not null or not ts >= 11220 or not ts <= 11221) and (not user_id = 1 or not user_id is not null or not ts >= 11222 or not ts <= 11223) and (not user_id = 1 or not user_id is not null or not ts >= 11224 or not ts <= 11225) and (not user_id = 1 or not user_id is not null or not ts >= 11226 or not ts <= 11227) and (not user_id = 1 or not user_id is not null or not ts >= 11228 or not ts <= 11229) and (not user_id = 1 or not user_id is not null or not ts >= 11230 or not ts <= 11231) and (not user_id = 1 or not user_id is not null or not ts >= 11232 or not ts <= 11233) and (not user_id = 1 or not user_id is not null or not ts >= 11234 or not ts <= 11235) and (not user_id = 1 or not user_id is not null or not ts >= 11236 or not ts <= 11237) and (not user_id = 1 or not user_id is not null or not ts >= 11238 or not ts <= 11239) and (not user_id = 1 or not user_id is not null or not ts >= 11240 or not ts <= 11241) and (not user_id = 1 or not user_id is not null or not ts >= 11242 or not ts <= 11243) and (not user_id = 1 or not user_id is not null or not ts >= 11244 or not ts <= 11245) and (not user_id = 1 or not user_id is not null or not ts >= 11246 or not ts <= 11247) and (not user_id = 1 or not user_id is not null or not ts >= 11248 or not ts <= 11249) and (not user_id = 1 or not user_id is not null or not ts >= 11250 or not ts <= 11251) and (not user_id = 1 or not user_id is not null or not ts >= 11252 or not ts <= 11253) and (not user_id = 1 or not user_id is not null or not ts >= 11254 or not ts <= 11255) and (not user_id = 1 or not user_id is not null or not ts >= 11256 or not ts <= 11257) and (not user_id = 1 or not user_id is not null or not ts >= 11258 or not ts <= 11259) and (not user_id = 1 or not user_id is not null or not ts >= 11260 or not ts <= 11261) and (not user_id = 1 or not user_id is not null or not ts >= 11262 or not ts <= 11263) and (not user_id = 1 or not user_id is not null or not ts >= 11264 or not ts <= 11265) and (not user_id = 1 or not user_id is not null or not ts >= 11266 or not ts <= 11267) and (not user_id = 1 or not user_id is not null or not ts >= 11268 or not ts <= 11269) and (not user_id = 1 or not user_id is not null or not ts >= 11270 or not ts <= 11271) and (not user_id = 1 or not user_id is not null or not ts >= 11272 or not ts <= 11273) and (not user_id = 1 or not user_id is not null or not ts >= 11274 or not ts <= 11275) and (not user_id = 1 or not user_id is not null or not ts >= 11276 or not ts <= 11277) and (not user_id = 1 or not user_id is not null or not ts >= 11278 or not ts <= 11279) and (not user_id = 1 or not user_id is not null or not ts >= 11280 or not ts <= 11281) and (not user_id = 1 or not user_id is not null or not ts >= 11282 or not ts <= 11283) and (not user_id = 1 or not user_id is not null or not ts >= 11284 or not ts <= 11285) and (not user_id = 1 or not user_id is not null or not ts >= 11286 or not ts <= 11287) and (not user_id = 1 or not user_id is not null or not ts >= 11288 or not ts <= 11289) and (not user_id = 1 or not user_id is not null or not ts >= 11290 or not ts <= 11291) and (not user_id = 1 or not user_id is not null or not ts >= 11292 or not ts <= 11293) and (not user_id = 1 or not user_id is not null or not ts >= 11294 or not ts <= 11295) and (not user_id = 1 or not user_id is not null or not ts >= 11296 or not ts <= 11297) and (not user_id = 1 or not user_id is not null or not ts >= 11298 or not ts <= 11299) and (not user_id = 1 or not user_id is not null or not ts >= 11300 or not ts <= 11301) and (not user_id = 1 or not user_id is not null or not ts >= 11302 or not ts <= 11303) and (not user_id = 1 or not user_id is not null or not ts >= 11304 or not ts <= 11305) and (not user_id = 1 or not user_id is not null or not ts >= 11306 or not ts <= 11307) and (not user_id = 1 or not user_id is not null or not ts >= 11308 or not ts <= 11309) and (not user_id = 1 or not user_id is not null or not ts >= 11310 or not ts <= 11311) and (not user_id = 1 or not user_id is not null or not ts >= 11312 or not ts <= 11313) and (not user_id = 1 or not user_id is not null or not ts >= 11314 or not ts <= 11315) and (not user_id = 1 or not user_id is not null or not ts >= 11316 or not ts <= 11317) and (not user_id = 1 or not user_id is not null or not ts >= 11318 or not ts <= 11319) and (not user_id = 1 or not user_id is not null or not ts >= 11320 or not ts <= 11321) and (not user_id = 1 or not user_id is not null or not ts >= 11322 or not ts <= 11323) and (not user_id = 1 or not user_id is not null or not ts >= 11324 or not ts <= 11325) and (not user_id = 1 or not user_id is not null or not ts >= 11326 or not ts <= 11327) and (not user_id = 1 or not user_id is not null or not ts >= 11328 or not ts <= 11329) and (not user_id = 1 or not user_id is not null or not ts >= 11330 or not ts <= 11331) and (not user_id = 1 or not user_id is not null or not ts >= 11332 or not ts <= 11333) and (not user_id = 1 or not user_id is not null or not ts >= 11334 or not ts <= 11335) and (not user_id = 1 or not user_id is not null or not ts >= 11336 or not ts <= 11337) and (not user_id = 1 or not user_id is not null or not ts >= 11338 or not ts <= 11339) and (not user_id = 1 or not user_id is not null or not ts >= 11340 or not ts <= 11341) and (not user_id = 1 or not user_id is not null or not ts >= 11342 or not ts <= 11343) and (not user_id = 1 or not user_id is not null or not ts >= 11344 or not ts <= 11345) and (not user_id = 1 or not user_id is not null or not ts >= 11346 or not ts <= 11347) and (not user_id = 1 or not user_id is not null or not ts >= 11348 or not ts <= 11349) and (not user_id = 1 or not user_id is not null or not ts >= 11350 or not ts <= 11351) and (not user_id = 1 or not user_id is not null or not ts >= 11352 or not ts <= 11353) and (not user_id = 1 or not user_id is not null or not ts >= 11354 or not ts <= 11355) and (not user_id = 1 or not user_id is not null or not ts >= 11356 or not ts <= 11357) and (not user_id = 1 or not user_id is not null or not ts >= 11358 or not ts <= 11359) and (not user_id = 1 or not user_id is not null or not ts >= 11360 or not ts <= 11361) and (not user_id = 1 or not user_id is not null or not ts >= 11362 or not ts <= 11363) and (not user_id = 1 or not user_id is not null or not ts >= 11364 or not ts <= 11365) and (not user_id = 1 or not user_id is not null or not ts >= 11366 or not ts <= 11367) and (not user_id = 1 or not user_id is not null or not ts >= 11368 or not ts <= 11369) and (not user_id = 1 or not user_id is not null or not ts >= 11370 or not ts <= 11371) and (not user_id = 1 or not user_id is not null or not ts >= 11372 or not ts <= 11373) and (not user_id = 1 or not user_id is not null or not ts >= 11374 or not ts <= 11375) and (not user_id = 1 or not user_id is not null or not ts >= 11376 or not ts <= 11377) and (not user_id = 1 or not user_id is not null or not ts >= 11378 or not ts <= 11379) and (not user_id = 1 or not user_id is not null or not ts >= 11380 or not ts <= 11381) and (not user_id = 1 or not user_id is not null or not ts >= 11382 or not ts <= 11383) and (not user_id = 1 or not user_id is not null or not ts >= 11384 or not ts <= 11385) and (not user_id = 1 or not user_id is not null or not ts >= 11386 or not ts <= 11387) and (not user_id = 1 or not user_id is not null or not ts >= 11388 or not ts <= 11389) and (not user_id = 1 or not user_id is not null or not ts >= 11390 or not ts <= 11391) and (not user_id = 1 or not user_id is not null or not ts >= 11392 or not ts <= 11393) and (not user_id = 1 or not user_id is not null or not ts >= 11394 or not ts <= 11395) and (not user_id = 1 or not user_id is not null or not ts >= 11396 or not ts <= 11397) and (not user_id = 1 or not user_id is not null or not ts >= 11398 or not ts <= 11399) and (not user_id = 1 or not user_id is not null or not ts >= 11400 or not ts <= 11401) and (not user_id = 1 or not user_id is not null or not ts >= 11402 or not ts <= 11403) and (not user_id = 1 or not user_id is not null or not ts >= 11404 or not ts <= 11405) and (not user_id = 1 or not user_id is not null or not ts >= 11406 or not ts <= 11407) and (not user_id = 1 or not user_id is not null or not ts >= 11408 or not ts <= 11409) and (not user_id = 1 or not user_id is not null or not ts >= 11410 or not ts <= 11411) and (not user_id = 1 or not user_id is not null or not ts >= 11412 or not ts <= 11413) and (not user_id = 1 or not user_id is not null or not ts >= 11414 or not ts <= 11415) and (not user_id = 1 or not user_id is not null or not ts >= 11416 or not ts <= 11417) and (not user_id = 1 or not user_id is not null or not ts >= 11418 or not ts <= 11419) and (not user_id = 1 or not user_id is not null or not ts >= 11420 or not ts <= 11421) and (not user_id = 1 or not user_id is not null or not ts >= 11422 or not ts <= 11423) and (not user_id = 1 or not user_id is not null or not ts >= 11424 or not ts <= 11425) and (not user_id = 1 or not user_id is not null or not ts >= 11426 or not ts <= 11427) and (not user_id = 1 or not user_id is not null or not ts >= 11428 or not ts <= 11429) and (not user_id = 1 or not user_id is not null or not ts >= 11430 or not ts <= 11431) and (not user_id = 1 or not user_id is not null or not ts >= 11432 or not ts <= 11433) and (not user_id = 1 or not user_id is not null or not ts >= 11434 or not ts <= 11435) and (not user_id = 1 or not user_id is not null or not ts >= 11436 or not ts <= 11437) and (not user_id = 1 or not user_id is not null or not ts >= 11438 or not ts <= 11439) and (not user_id = 1 or not user_id is not null or not ts >= 11440 or not ts <= 11441) and (not user_id = 1 or not user_id is not null or not ts >= 11442 or not ts <= 11443) and (not user_id = 1 or not user_id is not null or not ts >= 11444 or not ts <= 11445) and (not user_id = 1 or not user_id is not null or not ts >= 11446 or not ts <= 11447) and (not user_id = 1 or not user_id is not null or not ts >= 11448 or not ts <= 11449) and (not user_id = 1 or not user_id is not null or not ts >= 11450 or not ts <= 11451) and (not user_id = 1 or not user_id is not null or not ts >= 11452 or not ts <= 11453) and (not user_id = 1 or not user_id is not null or not ts >= 11454 or not ts <= 11455) and (not user_id = 1 or not user_id is not null or not ts >= 11456 or not ts <= 11457) and (not user_id = 1 or not user_id is not null or not ts >= 11458 or not ts <= 11459) and (not user_id = 1 or not user_id is not null or not ts >= 11460 or not ts <= 11461) and (not user_id = 1 or not user_id is not null or not ts >= 11462 or not ts <= 11463) and (not user_id = 1 or not user_id is not null or not ts >= 11464 or not ts <= 11465) and (not user_id = 1 or not user_id is not null or not ts >= 11466 or not ts <= 11467) and (not user_id = 1 or not user_id is not null or not ts >= 11468 or not ts <= 11469) and (not user_id = 1 or not user_id is not null or not ts >= 11470 or not ts <= 11471) and (not user_id = 1 or not user_id is not null or not ts >= 11472 or not ts <= 11473) and (not user_id = 1 or not user_id is not null or not ts >= 11474 or not ts <= 11475) and (not user_id = 1 or not user_id is not null or not ts >= 11476 or not ts <= 11477) and (not user_id = 1 or not user_id is not null or not ts >= 11478 or not ts <= 11479) and (not user_id = 1 or not user_id is not null or not ts >= 11480 or not ts <= 11481) and (not user_id = 1 or not user_id is not null or not ts >= 11482 or not ts <= 11483) and (not user_id = 1 or not user_id is not null or not ts >= 11484 or not ts <= 11485) and (not user_id = 1 or not user_id is not null or not ts >= 11486 or not ts <= 11487) and (not user_id = 1 or not user_id is not null or not ts >= 11488 or not ts <= 11489) and (not user_id = 1 or not user_id is not null or not ts >= 11490 or not ts <= 11491) and (not user_id = 1 or not user_id is not null or not ts >= 11492 or not ts <= 11493) and (not user_id = 1 or not user_id is not null or not ts >= 11494 or not ts <= 11495) and (not user_id = 1 or not user_id is not null or not ts >= 11496 or not ts <= 11497) and (not user_id = 1 or not user_id is not null or not ts >= 11498 or not ts <= 11499) and (not user_id = 1 or not user_id is not null or not ts >= 11500 or not ts <= 11501) and (not user_id = 1 or not user_id is not null or not ts >= 11502 or not ts <= 11503) and (not user_id = 1 or not user_id is not null or not ts >= 11504 or not ts <= 11505) and (not user_id = 1 or not user_id is not null or not ts >= 11506 or not ts <= 11507) and (not user_id = 1 or not user_id is not null or not ts >= 11508 or not ts <= 11509) and (not user_id = 1 or not user_id is not null or not ts >= 11510 or not ts <= 11511) and (not user_id = 1 or not user_id is not null or not ts >= 11512 or not ts <= 11513) and (not user_id = 1 or not user_id is not null or not ts >= 11514 or not ts <= 11515) and (not user_id = 1 or not user_id is not null or not ts >= 11516 or not ts <= 11517) and (not user_id = 1 or not user_id is not null or not ts >= 11518 or not ts <= 11519) and (not user_id = 1 or not user_id is not null or not ts >= 11520 or not ts <= 11521) and (not user_id = 1 or not user_id is not null or not ts >= 11522 or not ts <= 11523) and (not user_id = 1 or not user_id is not null or not ts >= 11524 or not ts <= 11525) and (not user_id = 1 or not user_id is not null or not ts >= 11526 or not ts <= 11527) and (not user_id = 1 or not user_id is not null or not ts >= 11528 or not ts <= 11529) and (not user_id = 1 or not user_id is not null or not ts >= 11530 or not ts <= 11531) and (not user_id = 1 or not user_id is not null or not ts >= 11532 or not ts <= 11533) and (not user_id = 1 or not user_id is not null or not ts >= 11534 or not ts <= 11535) and (not user_id = 1 or not user_id is not null or not ts >= 11536 or not ts <= 11537) and (not user_id = 1 or not user_id is not null or not ts >= 11538 or not ts <= 11539) and (not user_id = 1 or not user_id is not null or not ts >= 11540 or not ts <= 11541) and (not user_id = 1 or not user_id is not null or not ts >= 11542 or not ts <= 11543) and (not user_id = 1 or not user_id is not null or not ts >= 11544 or not ts <= 11545) and (not user_id = 1 or not user_id is not null or not ts >= 11546 or not ts <= 11547) and (not user_id = 1 or not user_id is not null or not ts >= 11548 or not ts <= 11549) and (not user_id = 1 or not user_id is not null or not ts >= 11550 or not ts <= 11551) and (not user_id = 1 or not user_id is not null or not ts >= 11552 or not ts <= 11553) and (not user_id = 1 or not user_id is not null or not ts >= 11554 or not ts <= 11555) and (not user_id = 1 or not user_id is not null or not ts >= 11556 or not ts <= 11557) and (not user_id = 1 or not user_id is not null or not ts >= 11558 or not ts <= 11559) and (not user_id = 1 or not user_id is not null or not ts >= 11560 or not ts <= 11561) and (not user_id = 1 or not user_id is not null or not ts >= 11562 or not ts <= 11563) and (not user_id = 1 or not user_id is not null or not ts >= 11564 or not ts <= 11565) and (not user_id = 1 or not user_id is not null or not ts >= 11566 or not ts <= 11567) and (not user_id = 1 or not user_id is not null or not ts >= 11568 or not ts <= 11569) and (not user_id = 1 or not user_id is not null or not ts >= 11570 or not ts <= 11571) and (not user_id = 1 or not user_id is not null or not ts >= 11572 or not ts <= 11573) and (not user_id = 1 or not user_id is not null or not ts >= 11574 or not ts <= 11575) and (not user_id = 1 or not user_id is not null or not ts >= 11576 or not ts <= 11577) and (not user_id = 1 or not user_id is not null or not ts >= 11578 or not ts <= 11579) and (not user_id = 1 or not user_id is not null or not ts >= 11580 or not ts <= 11581) and (not user_id = 1 or not user_id is not null or not ts >= 11582 or not ts <= 11583) and (not user_id = 1 or not user_id is not null or not ts >= 11584 or not ts <= 11585) and (not user_id = 1 or not user_id is not null or not ts >= 11586 or not ts <= 11587) and (not user_id = 1 or not user_id is not null or not ts >= 11588 or not ts <= 11589) and (not user_id = 1 or not user_id is not null or not ts >= 11590 or not ts <= 11591) and (not user_id = 1 or not user_id is not null or not ts >= 11592 or not ts <= 11593) and (not user_id = 1 or not user_id is not null or not ts >= 11594 or not ts <= 11595) and (not user_id = 1 or not user_id is not null or not ts >= 11596 or not ts <= 11597) and (not user_id = 1 or not user_id is not null or not ts >= 11598 or not ts <= 11599) and (not user_id = 1 or not user_id is not null or not ts >= 11600 or not ts <= 11601) and (not user_id = 1 or not user_id is not null or not ts >= 11602 or not ts <= 11603) and (not user_id = 1 or not user_id is not null or not ts >= 11604 or not ts <= 11605) and (not user_id = 1 or not user_id is not null or not ts >= 11606 or not ts <= 11607) and (not user_id = 1 or not user_id is not null or not ts >= 11608 or not ts <= 11609) and (not user_id = 1 or not user_id is not null or not ts >= 11610 or not ts <= 11611) and (not user_id = 1 or not user_id is not null or not ts >= 11612 or not ts <= 11613) and (not user_id = 1 or not user_id is not null or not ts >= 11614 or not ts <= 11615) and (not user_id = 1 or not user_id is not null or not ts >= 11616 or not ts <= 11617) and (not user_id = 1 or not user_id is not null or not ts >= 11618 or not ts <= 11619) and (not user_id = 1 or not user_id is not null or not ts >= 11620 or not ts <= 11621) and (not user_id = 1 or not user_id is not null or not ts >= 11622 or not ts <= 11623) and (not user_id = 1 or not user_id is not null or not ts >= 11624 or not ts <= 11625) and (not user_id = 1 or not user_id is not null or not ts >= 11626 or not ts <= 11627) and (not user_id = 1 or not user_id is not null or not ts >= 11628 or not ts <= 11629) and (not user_id = 1 or not user_id is not null or not ts >= 11630 or not ts <= 11631) and (not user_id = 1 or not user_id is not null or not ts >= 11632 or not ts <= 11633) and (not user_id = 1 or not user_id is not null or not ts >= 11634 or not ts <= 11635) and (not user_id = 1 or not user_id is not null or not ts >= 11636 or not ts <= 11637) and (not user_id = 1 or not user_id is not null or not ts >= 11638 or not ts <= 11639) and (not user_id = 1 or not user_id is not null or not ts >= 11640 or not ts <= 11641) and (not user_id = 1 or not user_id is not null or not ts >= 11642 or not ts <= 11643) and (not user_id = 1 or not user_id is not null or not ts >= 11644 or not ts <= 11645) and (not user_id = 1 or not user_id is not null or not ts >= 11646 or not ts <= 11647) and (not user_id = 1 or not user_id is not null or not ts >= 11648 or not ts <= 11649) and (not user_id = 1 or not user_id is not null or not ts >= 11650 or not ts <= 11651) and (not user_id = 1 or not user_id is not null or not ts >= 11652 or not ts <= 11653) and (not user_id = 1 or not user_id is not null or not ts >= 11654 or not ts <= 11655) and (not user_id = 1 or not user_id is not null or not ts >= 11656 or not ts <= 11657) and (not user_id = 1 or not user_id is not null or not ts >= 11658 or not ts <= 11659) and (not user_id = 1 or not user_id is not null or not ts >= 11660 or not ts <= 11661) and (not user_id = 1 or not user_id is not null or not ts >= 11662 or not ts <= 11663) and (not user_id = 1 or not user_id is not null or not ts >= 11664 or not ts <= 11665) and (not user_id = 1 or not user_id is not null or not ts >= 11666 or not ts <= 11667) and (not user_id = 1 or not user_id is not null or not ts >= 11668 or not ts <= 11669) and (not user_id = 1 or not user_id is not null or not ts >= 11670 or not ts <= 11671) and (not user_id = 1 or not user_id is not null or not ts >= 11672 or not ts <= 11673) and (not user_id = 1 or not user_id is not null or not ts >= 11674 or not ts <= 11675) and (not user_id = 1 or not user_id is not null or not ts >= 11676 or not ts <= 11677) and (not user_id = 1 or not user_id is not null or not ts >= 11678 or not ts <= 11679) and (not user_id = 1 or not user_id is not null or not ts >= 11680 or not ts <= 11681) and (not user_id = 1 or not user_id is not null or not ts >= 11682 or not ts <= 11683) and (not user_id = 1 or not user_id is not null or not ts >= 11684 or not ts <= 11685) and (not user_id = 1 or not user_id is not null or not ts >= 11686 or not ts <= 11687) and (not user_id = 1 or not user_id is not null or not ts >= 11688 or not ts <= 11689) and (not user_id = 1 or not user_id is not null or not ts >= 11690 or not ts <= 11691) and (not user_id = 1 or not user_id is not null or not ts >= 11692 or not ts <= 11693) and (not user_id = 1 or not user_id is not null or not ts >= 11694 or not ts <= 11695) and (not user_id = 1 or not user_id is not null or not ts >= 11696 or not ts <= 11697) and (not user_id = 1 or not user_id is not null or not ts >= 11698 or not ts <= 11699) and (not user_id = 1 or not user_id is not null or not ts >= 11700 or not ts <= 11701) and (not user_id = 1 or not user_id is not null or not ts >= 11702 or not ts <= 11703) and (not user_id = 1 or not user_id is not null or not ts >= 11704 or not ts <= 11705) and (not user_id = 1 or not user_id is not null or not ts >= 11706 or not ts <= 11707) and (not user_id = 1 or not user_id is not null or not ts >= 11708 or not ts <= 11709) and (not user_id = 1 or not user_id is not null or not ts >= 11710 or not ts <= 11711) and (not user_id = 1 or not user_id is not null or not ts >= 11712 or not ts <= 11713) and (not user_id = 1 or not user_id is not null or not ts >= 11714 or not ts <= 11715) and (not user_id = 1 or not user_id is not null or not ts >= 11716 or not ts <= 11717) and (not user_id = 1 or not user_id is not null or not ts >= 11718 or not ts <= 11719) and (not user_id = 1 or not user_id is not null or not ts >= 11720 or not ts <= 11721) and (not user_id = 1 or not user_id is not null or not ts >= 11722 or not ts <= 11723) and (not user_id = 1 or not user_id is not null or not ts >= 11724 or not ts <= 11725) and (not user_id = 1 or not user_id is not null or not ts >= 11726 or not ts <= 11727) and (not user_id = 1 or not user_id is not null or not ts >= 11728 or not ts <= 11729) and (not user_id = 1 or not user_id is not null or not ts >= 11730 or not ts <= 11731) and (not user_id = 1 or not user_id is not null or not ts >= 11732 or not ts <= 11733) and (not user_id = 1 or not user_id is not null or not ts >= 11734 or not ts <= 11735) and (not user_id = 1 or not user_id is not null or not ts >= 11736 or not ts <= 11737) and (not user_id = 1 or not user_id is not null or not ts >= 11738 or not ts <= 11739) and (not user_id = 1 or not user_id is not null or not ts >= 11740 or not ts <= 11741) and (not user_id = 1 or not user_id is not null or not ts >= 11742 or not ts <= 11743) and (not user_id = 1 or not user_id is not null or not ts >= 11744 or not ts <= 11745) and (not user_id = 1 or not user_id is not null or not ts >= 11746 or not ts <= 11747) and (not user_id = 1 or not user_id is not null or not ts >= 11748 or not ts <= 11749) and (not user_id = 1 or not user_id is not null or not ts >= 11750 or not ts <= 11751) and (not user_id = 1 or not user_id is not null or not ts >= 11752 or not ts <= 11753) and (not user_id = 1 or not user_id is not null or not ts >= 11754 or not ts <= 11755) and (not user_id = 1 or not user_id is not null or not ts >= 11756 or not ts <= 11757) and (not user_id = 1 or not user_id is not null or not ts >= 11758 or not ts <= 11759) and (not user_id = 1 or not user_id is not null or not ts >= 11760 or not ts <= 11761) and (not user_id = 1 or not user_id is not null or not ts >= 11762 or not ts <= 11763) and (not user_id = 1 or not user_id is not null or not ts >= 11764 or not ts <= 11765) and (not user_id = 1 or not user_id is not null or not ts >= 11766 or not ts <= 11767) and (not user_id = 1 or not user_id is not null or not ts >= 11768 or not ts <= 11769) and (not user_id = 1 or not user_id is not null or not ts >= 11770 or not ts <= 11771) and (not user_id = 1 or not user_id is not null or not ts >= 11772 or not ts <= 11773) and (not user_id = 1 or not user_id is not null or not ts >= 11774 or not ts <= 11775) and (not user_id = 1 or not user_id is not null or not ts >= 11776 or not ts <= 11777) and (not user_id = 1 or not user_id is not null or not ts >= 11778 or not ts <= 11779) and (not user_id = 1 or not user_id is not null or not ts >= 11780 or not ts <= 11781) and (not user_id = 1 or not user_id is not null or not ts >= 11782 or not ts <= 11783) and (not user_id = 1 or not user_id is not null or not ts >= 11784 or not ts <= 11785) and (not user_id = 1 or not user_id is not null or not ts >= 11786 or not ts <= 11787) and (not user_id = 1 or not user_id is not null or not ts >= 11788 or not ts <= 11789) and (not user_id = 1 or not user_id is not null or not ts >= 11790 or not ts <= 11791) and (not user_id = 1 or not user_id is not null or not ts >= 11792 or not ts <= 11793) and (not user_id = 1 or not user_id is not null or not ts >= 11794 or not ts <= 11795) and (not user_id = 1 or not user_id is not null or not ts >= 11796 or not ts <= 11797) and (not user_id = 1 or not user_id is not null or not ts >= 11798 or not ts <= 11799) and (not user_id = 1 or not user_id is not null or not ts >= 11800 or not ts <= 11801) and (not user_id = 1 or not user_id is not null or not ts >= 11802 or not ts <= 11803) and (not user_id = 1 or not user_id is not null or not ts >= 11804 or not ts <= 11805) and (not user_id = 1 or not user_id is not null or not ts >= 11806 or not ts <= 11807) and (not user_id = 1 or not user_id is not null or not ts >= 11808 or not ts <= 11809) and (not user_id = 1 or not user_id is not null or not ts >= 11810 or not ts <= 11811) and (not user_id = 1 or not user_id is not null or not ts >= 11812 or not ts <= 11813) and (not user_id = 1 or not user_id is not null or not ts >= 11814 or not ts <= 11815) and (not user_id = 1 or not user_id is not null or not ts >= 11816 or not ts <= 11817) and (not user_id = 1 or not user_id is not null or not ts >= 11818 or not ts <= 11819) and (not user_id = 1 or not user_id is not null or not ts >= 11820 or not ts <= 11821) and (not user_id = 1 or not user_id is not null or not ts >= 11822 or not ts <= 11823) and (not user_id = 1 or not user_id is not null or not ts >= 11824 or not ts <= 11825) and (not user_id = 1 or not user_id is not null or not ts >= 11826 or not ts <= 11827) and (not user_id = 1 or not user_id is not null or not ts >= 11828 or not ts <= 11829) and (not user_id = 1 or not user_id is not null or not ts >= 11830 or not ts <= 11831) and (not user_id = 1 or not user_id is not null or not ts >= 11832 or not ts <= 11833) and (not user_id = 1 or not user_id is not null or not ts >= 11834 or not ts <= 11835) and (not user_id = 1 or not user_id is not null or not ts >= 11836 or not ts <= 11837) and (not user_id = 1 or not user_id is not null or not ts >= 11838 or not ts <= 11839) and (not user_id = 1 or not user_id is not null or not ts >= 11840 or not ts <= 11841) and (not user_id = 1 or not user_id is not null or not ts >= 11842 or not ts <= 11843) and (not user_id = 1 or not user_id is not null or not ts >= 11844 or not ts <= 11845) and (not user_id = 1 or not user_id is not null or not ts >= 11846 or not ts <= 11847) and (not user_id = 1 or not user_id is not null or not ts >= 11848 or not ts <= 11849) and (not user_id = 1 or not user_id is not null or not ts >= 11850 or not ts <= 11851) and (not user_id = 1 or not user_id is not null or not ts >= 11852 or not ts <= 11853) and (not user_id = 1 or not user_id is not null or not ts >= 11854 or not ts <= 11855) and (not user_id = 1 or not user_id is not null or not ts >= 11856 or not ts <= 11857) and (not user_id = 1 or not user_id is not null or not ts >= 11858 or not ts <= 11859) and (not user_id = 1 or not user_id is not null or not ts >= 11860 or not ts <= 11861) and (not user_id = 1 or not user_id is not null or not ts >= 11862 or not ts <= 11863) and (not user_id = 1 or not user_id is not null or not ts >= 11864 or not ts <= 11865) and (not user_id = 1 or not user_id is not null or not ts >= 11866 or not ts <= 11867) and (not user_id = 1 or not user_id is not null or not ts >= 11868 or not ts <= 11869) and (not user_id = 1 or not user_id is not null or not ts >= 11870 or not ts <= 11871) and (not user_id = 1 or not user_id is not null or not ts >= 11872 or not ts <= 11873) and (not user_id = 1 or not user_id is not null or not ts >= 11874 or not ts <= 11875) and (not user_id = 1 or not user_id is not null or not ts >= 11876 or not ts <= 11877) and (not user_id = 1 or not user_id is not null or not ts >= 11878 or not ts <= 11879) and (not user_id = 1 or not user_id is not null or not ts >= 11880 or not ts <= 11881) and (not user_id = 1 or not user_id is not null or not ts >= 11882 or not ts <= 11883) and (not user_id = 1 or not user_id is not null or not ts >= 11884 or not ts <= 11885) and (not user_id = 1 or not user_id is not null or not ts >= 11886 or not ts <= 11887) and (not user_id = 1 or not user_id is not null or not ts >= 11888 or not ts <= 11889) and (not user_id = 1 or not user_id is not null or not ts >= 11890 or not ts <= 11891) and (not user_id = 1 or not user_id is not null or not ts >= 11892 or not ts <= 11893) and (not user_id = 1 or not user_id is not null or not ts >= 11894 or not ts <= 11895) and (not user_id = 1 or not user_id is not null or not ts >= 11896 or not ts <= 11897) and (not user_id = 1 or not user_id is not null or not ts >= 11898 or not ts <= 11899) and (not user_id = 1 or not user_id is not null or not ts >= 11900 or not ts <= 11901) and (not user_id = 1 or not user_id is not null or not ts >= 11902 or not ts <= 11903) and (not user_id = 1 or not user_id is not null or not ts >= 11904 or not ts <= 11905) and (not user_id = 1 or not user_id is not null or not ts >= 11906 or not ts <= 11907) and (not user_id = 1 or not user_id is not null or not ts >= 11908 or not ts <= 11909) and (not user_id = 1 or not user_id is not null or not ts >= 11910 or not ts <= 11911) and (not user_id = 1 or not user_id is not null or not ts >= 11912 or not ts <= 11913) and (not user_id = 1 or not user_id is not null or not ts >= 11914 or not ts <= 11915) and (not user_id = 1 or not user_id is not null or not ts >= 11916 or not ts <= 11917) and (not user_id = 1 or not user_id is not null or not ts >= 11918 or not ts <= 11919) and (not user_id = 1 or not user_id is not null or not ts >= 11920 or not ts <= 11921) and (not user_id = 1 or not user_id is not null or not ts >= 11922 or not ts <= 11923) and (not user_id = 1 or not user_id is not null or not ts >= 11924 or not ts <= 11925) and (not user_id = 1 or not user_id is not null or not ts >= 11926 or not ts <= 11927) and (not user_id = 1 or not user_id is not null or not ts >= 11928 or not ts <= 11929) and (not user_id = 1 or not user_id is not null or not ts >= 11930 or not ts <= 11931) and (not user_id = 1 or not user_id is not null or not ts >= 11932 or not ts <= 11933) and (not user_id = 1 or not user_id is not null or not ts >= 11934 or not ts <= 11935) and (not user_id = 1 or not user_id is not null or not ts >= 11936 or not ts <= 11937) and (not user_id = 1 or not user_id is not null or not ts >= 11938 or not ts <= 11939) and (not user_id = 1 or not user_id is not null or not ts >= 11940 or not ts <= 11941) and (not user_id = 1 or not user_id is not null or not ts >= 11942 or not ts <= 11943) and (not user_id = 1 or not user_id is not null or not ts >= 11944 or not ts <= 11945) and (not user_id = 1 or not user_id is not null or not ts >= 11946 or not ts <= 11947) and (not user_id = 1 or not user_id is not null or not ts >= 11948 or not ts <= 11949) and (not user_id = 1 or not user_id is not null or not ts >= 11950 or not ts <= 11951) and (not user_id = 1 or not user_id is not null or not ts >= 11952 or not ts <= 11953) and (not user_id = 1 or not user_id is not null or not ts >= 11954 or not ts <= 11955) and (not user_id = 1 or not user_id is not null or not ts >= 11956 or not ts <= 11957) and (not user_id = 1 or not user_id is not null or not ts >= 11958 or not ts <= 11959) and (not user_id = 1 or not user_id is not null or not ts >= 11960 or not ts <= 11961) and (not user_id = 1 or not user_id is not null or not ts >= 11962 or not ts <= 11963) and (not user_id = 1 or not user_id is not null or not ts >= 11964 or not ts <= 11965) and (not user_id = 1 or not user_id is not null or not ts >= 11966 or not ts <= 11967) and (not user_id = 1 or not user_id is not null or not ts >= 11968 or not ts <= 11969) and (not user_id = 1 or not user_id is not null or not ts >= 11970 or not ts <= 11971) and (not user_id = 1 or not user_id is not null or not ts >= 11972 or not ts <= 11973) and (not user_id = 1 or not user_id is not null or not ts >= 11974 or not ts <= 11975) and (not user_id = 1 or not user_id is not null or not ts >= 11976 or not ts <= 11977) and (not user_id = 1 or not user_id is not null or not ts >= 11978 or not ts <= 11979) and (not user_id = 1 or not user_id is not null or not ts >= 11980 or not ts <= 11981) and (not user_id = 1 or not user_id is not null or not ts >= 11982 or not ts <= 11983) and (not user_id = 1 or not user_id is not null or not ts >= 11984 or not ts <= 11985) and (not user_id = 1 or not user_id is not null or not ts >= 11986 or not ts <= 11987) and (not user_id = 1 or not user_id is not null or not ts >= 11988 or not ts <= 11989) and (not user_id = 1 or not user_id is not null or not ts >= 11990 or not ts <= 11991) and (not user_id = 1 or not user_id is not null or not ts >= 11992 or not ts <= 11993) and ts >= 113898 and parent_id = 1 order by ts asc limit 100", - "ResultColumns": 1, - "Table": "`user`" + "ResultColumns": 1 } ] }, @@ -4820,7 +4621,6 @@ }, "FieldQuery": "select 1 from `user` where 1 != 1", "Query": "select 1 from `user` where id = 12 and exists (select 1 from music where user_id = 12 union select 1 from user_extra where user_id = 12)", - "Table": "`user`", "Values": [ "12" ], @@ -4849,7 +4649,6 @@ }, "FieldQuery": "select 1 from `user` where 1 != 1", "Query": "select 1 from `user` where (id, col) in ::vals", - "Table": "`user`", "Values": [ "vals:0" ], @@ -4877,7 +4676,6 @@ }, "FieldQuery": "select 1 from `user` where 1 != 1", "Query": "select 1 from `user` where (col, id) in ::vals", - "Table": "`user`", "Values": [ "vals:1" ], @@ -4905,7 +4703,6 @@ }, "FieldQuery": "select 1 from multicol_tbl where 1 != 1", "Query": "select 1 from multicol_tbl where (cola, colb) in ::vals", - "Table": "multicol_tbl", "Values": [ "vals:0", "vals:1" @@ -4934,7 +4731,6 @@ }, "FieldQuery": "select 1 from multicol_tbl where 1 != 1", "Query": "select 1 from multicol_tbl where cola in ::__vals0", - "Table": "multicol_tbl", "Values": [ "::vals" ], @@ -4962,7 +4758,6 @@ }, "FieldQuery": "select 1 from multicol_tbl where 1 != 1", "Query": "select 1 from multicol_tbl where (cola, colx, colb) in ::vals", - "Table": "multicol_tbl", "Values": [ "vals:0", "vals:2" @@ -4991,7 +4786,6 @@ }, "FieldQuery": "select 1 from multicol_tbl where 1 != 1", "Query": "select 1 from multicol_tbl where (colb, colx, cola) in ::vals", - "Table": "multicol_tbl", "Values": [ "vals:2", "vals:0" @@ -5020,7 +4814,6 @@ }, "FieldQuery": "select col from `user` where 1 != 1", "Query": "select col from `user` where id = 1 order by `user`.user_id asc", - "Table": "`user`", "Values": [ "1" ], @@ -5047,7 +4840,6 @@ }, "FieldQuery": "select col from `user` where 1 != 1 group by `user`.user_id", "Query": "select col from `user` where id = 1 group by `user`.user_id", - "Table": "`user`", "Values": [ "1" ], @@ -5074,7 +4866,6 @@ }, "FieldQuery": "select user_id, col1, col2 from authoritative where 1 != 1", "Query": "select user_id, col1, col2 from authoritative where user_id = 5 order by authoritative.user_id asc", - "Table": "authoritative", "Values": [ "5" ], @@ -5101,7 +4892,6 @@ }, "FieldQuery": "select user_id, col1, col2 from authoritative where 1 != 1 group by user_id", "Query": "select user_id, col1, col2 from authoritative where user_id = 5 group by user_id having count(user_id) = 6 order by authoritative.user_id asc", - "Table": "authoritative", "Values": [ "5" ], @@ -5128,7 +4918,6 @@ }, "FieldQuery": "select id from unq_binary_idx where 1 != 1", "Query": "select id from unq_binary_idx where id between 1 and 5", - "Table": "unq_binary_idx", "Values": [ "(1, 5)" ], @@ -5154,8 +4943,7 @@ "Sharded": true }, "FieldQuery": "select id from customer where 1 != 1", - "Query": "select id from customer where id between 1 and 5", - "Table": "customer" + "Query": "select id from customer where id between 1 and 5" }, "TablesUsed": [ "user.customer" @@ -5177,8 +4965,7 @@ "Sharded": true }, "FieldQuery": "select id, col1 from unq_binary_idx where 1 != 1", - "Query": "select id, col1 from unq_binary_idx where col1 between 10 and 50", - "Table": "unq_binary_idx" + "Query": "select id, col1 from unq_binary_idx where col1 between 10 and 50" }, "TablesUsed": [ "user.unq_binary_idx" @@ -5200,8 +4987,7 @@ "Sharded": true }, "FieldQuery": "select cola, colb, colc from multicol_tbl where 1 != 1", - "Query": "select cola, colb, colc from multicol_tbl where cola between 1 and 5", - "Table": "multicol_tbl" + "Query": "select cola, colb, colc from multicol_tbl where cola between 1 and 5" }, "TablesUsed": [ "user.multicol_tbl" @@ -5224,7 +5010,6 @@ "se_end": 3, "se_start": 2 }, - "TableName": "sales_extra_sales", "Inputs": [ { "OperatorType": "Route", @@ -5234,8 +5019,7 @@ "Sharded": true }, "FieldQuery": "select se.colb, se.cola, se.`start`, se.`end` from sales_extra as se where 1 != 1", - "Query": "select se.colb, se.cola, se.`start`, se.`end` from sales_extra as se", - "Table": "sales_extra" + "Query": "select se.colb, se.cola, se.`start`, se.`end` from sales_extra as se" }, { "OperatorType": "Route", @@ -5246,7 +5030,6 @@ }, "FieldQuery": "select s.oid, s.col1 from sales as s where 1 != 1", "Query": "select s.oid, s.col1 from sales as s where s.oid between :se_start /* INT16 */ and :se_end /* INT16 */ and s.col1 = :se_cola /* VARCHAR */", - "Table": "sales", "Values": [ "(:se_start, :se_end)" ], diff --git a/go/vt/vtgate/planbuilder/testdata/foreignkey_cases.json b/go/vt/vtgate/planbuilder/testdata/foreignkey_cases.json index 74a53146278..024a71017dc 100644 --- a/go/vt/vtgate/planbuilder/testdata/foreignkey_cases.json +++ b/go/vt/vtgate/planbuilder/testdata/foreignkey_cases.json @@ -19,7 +19,6 @@ "Sharded": true }, "Query": "insert into tbl2(col2, coly) values (:_col2_0, 3)", - "TableName": "tbl2", "VindexValues": { "hash_vin": "1" } @@ -44,7 +43,6 @@ "Sharded": true }, "Query": "insert into multicol_tbl2(cola, colb, colc) values (:_cola_0, :_colb_0, :_colc_0)", - "TableName": "multicol_tbl2", "VindexValues": { "multicolIdx": "1, 2, 3" } @@ -84,7 +82,6 @@ }, "FieldQuery": "select multicol_tbl1.colb, multicol_tbl1.cola, multicol_tbl1.y, multicol_tbl1.colc, multicol_tbl1.x from multicol_tbl1 where 1 != 1", "Query": "select multicol_tbl1.colb, multicol_tbl1.cola, multicol_tbl1.y, multicol_tbl1.colc, multicol_tbl1.x from multicol_tbl1 where cola = 1 and colb = 2 and colc = 3 for update", - "Table": "multicol_tbl1", "Values": [ "1", "2", @@ -109,7 +106,6 @@ 4 ], "Query": "delete from multicol_tbl2 where (colb, cola, x, colc, y) in ::fkc_vals", - "Table": "multicol_tbl2", "Values": [ "fkc_vals:1", "fkc_vals:0", @@ -126,7 +122,6 @@ "Sharded": true }, "Query": "delete from multicol_tbl1 where cola = 1 and colb = 2 and colc = 3", - "Table": "multicol_tbl1", "Values": [ "1", "2", @@ -161,8 +156,7 @@ "Sharded": true }, "FieldQuery": "select tbl5.col5, tbl5.t5col5 from tbl5 where 1 != 1", - "Query": "select tbl5.col5, tbl5.t5col5 from tbl5 for update", - "Table": "tbl5" + "Query": "select tbl5.col5, tbl5.t5col5 from tbl5 for update" }, { "InputName": "CascadeChild-1", @@ -177,7 +171,6 @@ 0 ], "Query": "delete from tbl4 where (col4) in ::fkc_vals", - "Table": "tbl4", "Values": [ "fkc_vals:0" ], @@ -195,8 +188,7 @@ "Cols": [ 1 ], - "Query": "delete from tbl4 where (t4col4) in ::fkc_vals1", - "Table": "tbl4" + "Query": "delete from tbl4 where (t4col4) in ::fkc_vals1" }, { "InputName": "Parent", @@ -206,8 +198,7 @@ "Name": "sharded_fk_allow", "Sharded": true }, - "Query": "delete from tbl5", - "Table": "tbl5" + "Query": "delete from tbl5" } ] }, @@ -241,8 +232,7 @@ "Sharded": false }, "FieldQuery": "select u_tbl9.col9 from u_tbl9 where 1 != 1", - "Query": "select u_tbl9.col9 from u_tbl9 where col9 = 5 for update nowait", - "Table": "u_tbl9" + "Query": "select u_tbl9.col9 from u_tbl9 where col9 = 5 for update nowait" }, { "InputName": "CascadeChild-1", @@ -256,8 +246,7 @@ "Cols": [ 0 ], - "Query": "update u_tbl8 set col8 = null where (col8) in ::fkc_vals", - "Table": "u_tbl8" + "Query": "update u_tbl8 set col8 = null where (col8) in ::fkc_vals" }, { "InputName": "Parent", @@ -267,8 +256,7 @@ "Name": "unsharded_fk_allow", "Sharded": false }, - "Query": "delete from u_tbl9 where col9 = 5", - "Table": "u_tbl9" + "Query": "delete from u_tbl9 where col9 = 5" } ] }, @@ -292,8 +280,7 @@ "Name": "unsharded_fk_allow", "Sharded": false }, - "Query": "update u_tbl5 set col5 = 'foo' where id = 1", - "Table": "u_tbl5" + "Query": "update u_tbl5 set col5 = 'foo' where id = 1" }, "TablesUsed": [ "unsharded_fk_allow.u_tbl5" @@ -319,8 +306,7 @@ "Sharded": false }, "FieldQuery": "select u_tbl2.col2 from u_tbl2 where 1 != 1", - "Query": "select u_tbl2.col2 from u_tbl2 where id = 1 for update", - "Table": "u_tbl2" + "Query": "select u_tbl2.col2 from u_tbl2 where id = 1 for update" }, { "InputName": "CascadeChild-1", @@ -334,8 +320,7 @@ "Cols": [ 0 ], - "Query": "update u_tbl3 set col3 = null where (col3) in ::fkc_vals and (col3) not in ((cast('bar' as CHAR)))", - "Table": "u_tbl3" + "Query": "update u_tbl3 set col3 = null where (col3) in ::fkc_vals and (col3) not in ((cast('bar' as CHAR)))" }, { "InputName": "Parent", @@ -345,8 +330,7 @@ "Name": "unsharded_fk_allow", "Sharded": false }, - "Query": "update u_tbl2 set col2 = 'bar' where id = 1", - "Table": "u_tbl2" + "Query": "update u_tbl2 set col2 = 'bar' where id = 1" } ] }, @@ -370,8 +354,7 @@ "Name": "unsharded_fk_allow", "Sharded": false }, - "Query": "update u_tbl2 set col_no_ref = 'baz' where id = 1", - "Table": "u_tbl2" + "Query": "update u_tbl2 set col_no_ref = 'baz' where id = 1" }, "TablesUsed": [ "unsharded_fk_allow.u_tbl2" @@ -397,8 +380,7 @@ "Name": "sharded_fk_allow", "Sharded": true }, - "Query": "update tbl1 set not_ref_col = 'foo' where id = 1", - "Table": "tbl1" + "Query": "update tbl1 set not_ref_col = 'foo' where id = 1" }, "TablesUsed": [ "sharded_fk_allow.tbl1" @@ -429,8 +411,7 @@ "Sharded": true }, "FieldQuery": "select tbl5.t5col5 from tbl5 where 1 != 1", - "Query": "select tbl5.t5col5 from tbl5 for update", - "Table": "tbl5" + "Query": "select tbl5.t5col5 from tbl5 for update" }, { "InputName": "CascadeChild-1", @@ -444,8 +425,7 @@ "Cols": [ 0 ], - "Query": "update tbl4 set t4col4 = null where (t4col4) in ::fkc_vals and (t4col4) not in (('foo'))", - "Table": "tbl4" + "Query": "update tbl4 set t4col4 = null where (t4col4) in ::fkc_vals and (t4col4) not in (('foo'))" }, { "InputName": "Parent", @@ -455,8 +435,7 @@ "Name": "sharded_fk_allow", "Sharded": true }, - "Query": "update tbl5 set t5col5 = 'foo'", - "Table": "tbl5" + "Query": "update tbl5 set t5col5 = 'foo'" } ] }, @@ -485,8 +464,7 @@ "Name": "sharded_fk_allow", "Sharded": true }, - "Query": "update tbl2 set col = 'foo'", - "Table": "tbl2" + "Query": "update tbl2 set col = 'foo'" }, "TablesUsed": [ "sharded_fk_allow.tbl2" @@ -522,7 +500,6 @@ "OperatorType": "Join", "Variant": "LeftJoin", "JoinColumnIndexes": "R:0", - "TableName": "tbl10_tbl3", "Inputs": [ { "OperatorType": "Route", @@ -532,8 +509,7 @@ "Sharded": true }, "FieldQuery": "select 1 from tbl10 where 1 != 1", - "Query": "select 1 from tbl10 where not (tbl10.col) <=> ('foo') for share", - "Table": "tbl10" + "Query": "select 1 from tbl10 where not (tbl10.col) <=> ('foo') for share" }, { "OperatorType": "Route", @@ -543,8 +519,7 @@ "Sharded": true }, "FieldQuery": "select tbl3.col from tbl3 where 1 != 1", - "Query": "select tbl3.col from tbl3 where tbl3.col = 'foo' for share", - "Table": "tbl3" + "Query": "select tbl3.col from tbl3 where tbl3.col = 'foo' for share" } ] } @@ -562,8 +537,7 @@ "Name": "sharded_fk_allow", "Sharded": true }, - "Query": "update tbl10 set col = 'foo'", - "Table": "tbl10" + "Query": "update tbl10 set col = 'foo'" } ] }, @@ -598,7 +572,6 @@ }, "FieldQuery": "select tbl9.col9 from tbl9 where 1 != 1", "Query": "select tbl9.col9 from tbl9 where col9 = 34 for update", - "Table": "tbl9", "Values": [ "34" ], @@ -616,8 +589,7 @@ "Cols": [ 0 ], - "Query": "update tbl4 set col_ref = null where (col_ref) in ::fkc_vals", - "Table": "tbl4" + "Query": "update tbl4 set col_ref = null where (col_ref) in ::fkc_vals" }, { "InputName": "Parent", @@ -628,7 +600,6 @@ "Sharded": true }, "Query": "delete from tbl9 where col9 = 34", - "Table": "tbl9", "Values": [ "34" ], @@ -661,8 +632,7 @@ "Sharded": false }, "FieldQuery": "select u_tbl1.col1 from u_tbl1 where 1 != 1", - "Query": "select u_tbl1.col1 from u_tbl1 for update", - "Table": "u_tbl1" + "Query": "select u_tbl1.col1 from u_tbl1 for update" }, { "InputName": "CascadeChild-1", @@ -681,8 +651,7 @@ "Sharded": false }, "FieldQuery": "select u_tbl2.col2 from u_tbl2 where 1 != 1", - "Query": "select u_tbl2.col2 from u_tbl2 where (col2) in ::fkc_vals for update", - "Table": "u_tbl2" + "Query": "select u_tbl2.col2 from u_tbl2 where (col2) in ::fkc_vals for update" }, { "InputName": "CascadeChild-1", @@ -696,8 +665,7 @@ "Cols": [ 0 ], - "Query": "update u_tbl3 set col3 = null where (col3) in ::fkc_vals1 and (col3) not in ((cast('foo' as CHAR)))", - "Table": "u_tbl3" + "Query": "update u_tbl3 set col3 = null where (col3) in ::fkc_vals1 and (col3) not in ((cast('foo' as CHAR)))" }, { "InputName": "Parent", @@ -707,8 +675,7 @@ "Name": "unsharded_fk_allow", "Sharded": false }, - "Query": "update /*+ SET_VAR(foreign_key_checks=OFF) */ u_tbl2 set col2 = 'foo' where (col2) in ::fkc_vals", - "Table": "u_tbl2" + "Query": "update /*+ SET_VAR(foreign_key_checks=OFF) */ u_tbl2 set col2 = 'foo' where (col2) in ::fkc_vals" } ] }, @@ -729,8 +696,7 @@ "Sharded": false }, "FieldQuery": "select u_tbl9.col9 from u_tbl9 where 1 != 1", - "Query": "select u_tbl9.col9 from u_tbl9 where (col9) in ::fkc_vals2 and (col9) not in ((cast('foo' as CHAR))) for update nowait", - "Table": "u_tbl9" + "Query": "select u_tbl9.col9 from u_tbl9 where (col9) in ::fkc_vals2 and (col9) not in ((cast('foo' as CHAR))) for update nowait" }, { "InputName": "CascadeChild-1", @@ -744,8 +710,7 @@ "Cols": [ 0 ], - "Query": "update u_tbl8 set col8 = null where (col8) in ::fkc_vals3", - "Table": "u_tbl8" + "Query": "update u_tbl8 set col8 = null where (col8) in ::fkc_vals3" }, { "InputName": "Parent", @@ -755,8 +720,7 @@ "Name": "unsharded_fk_allow", "Sharded": false }, - "Query": "update u_tbl9 set col9 = null where (col9) in ::fkc_vals2 and (col9) not in ((cast('foo' as CHAR)))", - "Table": "u_tbl9" + "Query": "update u_tbl9 set col9 = null where (col9) in ::fkc_vals2 and (col9) not in ((cast('foo' as CHAR)))" } ] }, @@ -768,8 +732,7 @@ "Name": "unsharded_fk_allow", "Sharded": false }, - "Query": "update u_tbl1 set col1 = 'foo'", - "Table": "u_tbl1" + "Query": "update u_tbl1 set col1 = 'foo'" } ] }, @@ -801,8 +764,7 @@ "Sharded": false }, "FieldQuery": "select 1 from u_tbl2 left join u_tbl1 on u_tbl1.col1 = cast(u_tbl2.col1 + 'bar' as CHAR) where 1 != 1", - "Query": "select 1 from u_tbl2 left join u_tbl1 on u_tbl1.col1 = cast(u_tbl2.col1 + 'bar' as CHAR) where u_tbl1.col1 is null and cast(u_tbl2.col1 + 'bar' as CHAR) is not null and not (u_tbl2.col2) <=> (cast(u_tbl2.col1 + 'bar' as CHAR)) and u_tbl2.id = 1 limit 1 for share", - "Table": "u_tbl1, u_tbl2" + "Query": "select 1 from u_tbl2 left join u_tbl1 on u_tbl1.col1 = cast(u_tbl2.col1 + 'bar' as CHAR) where u_tbl1.col1 is null and cast(u_tbl2.col1 + 'bar' as CHAR) is not null and not (u_tbl2.col2) <=> (cast(u_tbl2.col1 + 'bar' as CHAR)) and u_tbl2.id = 1 limit 1 for share" }, { "InputName": "PostVerify", @@ -817,8 +779,7 @@ "Sharded": false }, "FieldQuery": "select u_tbl2.col2, col2 <=> cast(col1 + 'bar' as CHAR), cast(col1 + 'bar' as CHAR) from u_tbl2 where 1 != 1", - "Query": "select u_tbl2.col2, col2 <=> cast(col1 + 'bar' as CHAR), cast(col1 + 'bar' as CHAR) from u_tbl2 where id = 1 for update", - "Table": "u_tbl2" + "Query": "select u_tbl2.col2, col2 <=> cast(col1 + 'bar' as CHAR), cast(col1 + 'bar' as CHAR) from u_tbl2 where id = 1 for update" }, { "InputName": "CascadeChild-1", @@ -839,8 +800,7 @@ "UpdateExprBvName": "fkc_upd" } ], - "Query": "update u_tbl3 set col3 = null where (col3) in ::fkc_vals and (:fkc_upd is null or (col3) not in ((:fkc_upd)))", - "Table": "u_tbl3" + "Query": "update u_tbl3 set col3 = null where (col3) in ::fkc_vals and (:fkc_upd is null or (col3) not in ((:fkc_upd)))" }, { "InputName": "Parent", @@ -850,8 +810,7 @@ "Name": "unsharded_fk_allow", "Sharded": false }, - "Query": "update /*+ SET_VAR(foreign_key_checks=OFF) */ u_tbl2 set m = 2, col2 = col1 + 'bar' where id = 1", - "Table": "u_tbl2" + "Query": "update /*+ SET_VAR(foreign_key_checks=OFF) */ u_tbl2 set m = 2, col2 = col1 + 'bar' where id = 1" } ] } @@ -883,8 +842,7 @@ "Sharded": false }, "FieldQuery": "select u_tbl1.col1, col1 <=> cast(x + 'bar' as CHAR), cast(x + 'bar' as CHAR) from u_tbl1 where 1 != 1", - "Query": "select u_tbl1.col1, col1 <=> cast(x + 'bar' as CHAR), cast(x + 'bar' as CHAR) from u_tbl1 where id = 1 for update", - "Table": "u_tbl1" + "Query": "select u_tbl1.col1, col1 <=> cast(x + 'bar' as CHAR), cast(x + 'bar' as CHAR) from u_tbl1 where id = 1 for update" }, { "InputName": "CascadeChild-1", @@ -910,8 +868,7 @@ "Sharded": false }, "FieldQuery": "select u_tbl2.col2 from u_tbl2 where 1 != 1", - "Query": "select u_tbl2.col2 from u_tbl2 where (col2) in ::fkc_vals for update", - "Table": "u_tbl2" + "Query": "select u_tbl2.col2 from u_tbl2 where (col2) in ::fkc_vals for update" }, { "InputName": "CascadeChild-1", @@ -925,8 +882,7 @@ "Cols": [ 0 ], - "Query": "update u_tbl3 set col3 = null where (col3) in ::fkc_vals1 and (cast(:fkc_upd as CHAR) is null or (col3) not in ((cast(:fkc_upd as CHAR))))", - "Table": "u_tbl3" + "Query": "update u_tbl3 set col3 = null where (col3) in ::fkc_vals1 and (cast(:fkc_upd as CHAR) is null or (col3) not in ((cast(:fkc_upd as CHAR))))" }, { "InputName": "Parent", @@ -936,8 +892,7 @@ "Name": "unsharded_fk_allow", "Sharded": false }, - "Query": "update /*+ SET_VAR(foreign_key_checks=OFF) */ u_tbl2 set col2 = :fkc_upd where (col2) in ::fkc_vals", - "Table": "u_tbl2" + "Query": "update /*+ SET_VAR(foreign_key_checks=OFF) */ u_tbl2 set col2 = :fkc_upd where (col2) in ::fkc_vals" } ] }, @@ -965,8 +920,7 @@ "Sharded": false }, "FieldQuery": "select u_tbl9.col9 from u_tbl9 where 1 != 1", - "Query": "select u_tbl9.col9 from u_tbl9 where (col9) in ::fkc_vals2 and (:fkc_upd1 is null or (col9) not in ((:fkc_upd1))) for update nowait", - "Table": "u_tbl9" + "Query": "select u_tbl9.col9 from u_tbl9 where (col9) in ::fkc_vals2 and (:fkc_upd1 is null or (col9) not in ((:fkc_upd1))) for update nowait" }, { "InputName": "CascadeChild-1", @@ -980,8 +934,7 @@ "Cols": [ 0 ], - "Query": "update u_tbl8 set col8 = null where (col8) in ::fkc_vals3", - "Table": "u_tbl8" + "Query": "update u_tbl8 set col8 = null where (col8) in ::fkc_vals3" }, { "InputName": "Parent", @@ -991,8 +944,7 @@ "Name": "unsharded_fk_allow", "Sharded": false }, - "Query": "update u_tbl9 set col9 = null where (col9) in ::fkc_vals2 and (:fkc_upd1 is null or (col9) not in ((:fkc_upd1)))", - "Table": "u_tbl9" + "Query": "update u_tbl9 set col9 = null where (col9) in ::fkc_vals2 and (:fkc_upd1 is null or (col9) not in ((:fkc_upd1)))" } ] }, @@ -1004,8 +956,7 @@ "Name": "unsharded_fk_allow", "Sharded": false }, - "Query": "update /*+ SET_VAR(foreign_key_checks=OFF) */ u_tbl1 set m = 2, col1 = x + 'bar' where id = 1", - "Table": "u_tbl1" + "Query": "update /*+ SET_VAR(foreign_key_checks=OFF) */ u_tbl1 set m = 2, col1 = x + 'bar' where id = 1" } ] }, @@ -1037,8 +988,7 @@ "Sharded": false }, "FieldQuery": "select u_tbl2.col2 from u_tbl2 where 1 != 1", - "Query": "select u_tbl2.col2 from u_tbl2 where id = 1 for update", - "Table": "u_tbl2" + "Query": "select u_tbl2.col2 from u_tbl2 where id = 1 for update" }, { "InputName": "CascadeChild-1", @@ -1052,8 +1002,7 @@ "Cols": [ 0 ], - "Query": "update u_tbl3 set col3 = null where (col3) in ::fkc_vals and (col3) not in ((cast(2 as CHAR)))", - "Table": "u_tbl3" + "Query": "update u_tbl3 set col3 = null where (col3) in ::fkc_vals and (col3) not in ((cast(2 as CHAR)))" }, { "InputName": "Parent", @@ -1063,8 +1012,7 @@ "Name": "unsharded_fk_allow", "Sharded": false }, - "Query": "update u_tbl2 set m = col1 + 'bar', col2 = 2 where id = 1", - "Table": "u_tbl2" + "Query": "update u_tbl2 set m = col1 + 'bar', col2 = 2 where id = 1" } ] }, @@ -1093,8 +1041,7 @@ "Sharded": false }, "FieldQuery": "select u_tbl1.col1 from u_tbl1 where 1 != 1", - "Query": "select u_tbl1.col1 from u_tbl1 where id = 1 for update", - "Table": "u_tbl1" + "Query": "select u_tbl1.col1 from u_tbl1 where id = 1 for update" }, { "InputName": "CascadeChild-1", @@ -1113,8 +1060,7 @@ "Sharded": false }, "FieldQuery": "select u_tbl2.col2 from u_tbl2 where 1 != 1", - "Query": "select u_tbl2.col2 from u_tbl2 where (col2) in ::fkc_vals for update", - "Table": "u_tbl2" + "Query": "select u_tbl2.col2 from u_tbl2 where (col2) in ::fkc_vals for update" }, { "InputName": "CascadeChild-1", @@ -1128,8 +1074,7 @@ "Cols": [ 0 ], - "Query": "update u_tbl3 set col3 = null where (col3) in ::fkc_vals1 and (col3) not in ((cast(2 as CHAR)))", - "Table": "u_tbl3" + "Query": "update u_tbl3 set col3 = null where (col3) in ::fkc_vals1 and (col3) not in ((cast(2 as CHAR)))" }, { "InputName": "Parent", @@ -1139,8 +1084,7 @@ "Name": "unsharded_fk_allow", "Sharded": false }, - "Query": "update /*+ SET_VAR(foreign_key_checks=OFF) */ u_tbl2 set col2 = 2 where (col2) in ::fkc_vals", - "Table": "u_tbl2" + "Query": "update /*+ SET_VAR(foreign_key_checks=OFF) */ u_tbl2 set col2 = 2 where (col2) in ::fkc_vals" } ] }, @@ -1161,8 +1105,7 @@ "Sharded": false }, "FieldQuery": "select u_tbl9.col9 from u_tbl9 where 1 != 1", - "Query": "select u_tbl9.col9 from u_tbl9 where (col9) in ::fkc_vals2 and (col9) not in ((cast(2 as CHAR))) for update nowait", - "Table": "u_tbl9" + "Query": "select u_tbl9.col9 from u_tbl9 where (col9) in ::fkc_vals2 and (col9) not in ((cast(2 as CHAR))) for update nowait" }, { "InputName": "CascadeChild-1", @@ -1176,8 +1119,7 @@ "Cols": [ 0 ], - "Query": "update u_tbl8 set col8 = null where (col8) in ::fkc_vals3", - "Table": "u_tbl8" + "Query": "update u_tbl8 set col8 = null where (col8) in ::fkc_vals3" }, { "InputName": "Parent", @@ -1187,8 +1129,7 @@ "Name": "unsharded_fk_allow", "Sharded": false }, - "Query": "update u_tbl9 set col9 = null where (col9) in ::fkc_vals2 and (col9) not in ((cast(2 as CHAR)))", - "Table": "u_tbl9" + "Query": "update u_tbl9 set col9 = null where (col9) in ::fkc_vals2 and (col9) not in ((cast(2 as CHAR)))" } ] }, @@ -1200,8 +1141,7 @@ "Name": "unsharded_fk_allow", "Sharded": false }, - "Query": "update u_tbl1 set m = x + 'bar', col1 = 2 where id = 1", - "Table": "u_tbl1" + "Query": "update u_tbl1 set m = x + 'bar', col1 = 2 where id = 1" } ] }, @@ -1240,8 +1180,7 @@ "Sharded": false }, "FieldQuery": "select u_tbl2.id from u_tbl2 where 1 != 1", - "Query": "select u_tbl2.id from u_tbl2 limit 2 for update", - "Table": "u_tbl2" + "Query": "select u_tbl2.id from u_tbl2 limit 2 for update" }, { "OperatorType": "FkCascade", @@ -1255,8 +1194,7 @@ "Sharded": false }, "FieldQuery": "select u_tbl2.col2 from u_tbl2 where 1 != 1", - "Query": "select u_tbl2.col2 from u_tbl2 where u_tbl2.id in ::dml_vals for update", - "Table": "u_tbl2" + "Query": "select u_tbl2.col2 from u_tbl2 where u_tbl2.id in ::dml_vals for update" }, { "InputName": "CascadeChild-1", @@ -1270,8 +1208,7 @@ "Cols": [ 0 ], - "Query": "update u_tbl3 set col3 = null where (col3) in ::fkc_vals", - "Table": "u_tbl3" + "Query": "update u_tbl3 set col3 = null where (col3) in ::fkc_vals" }, { "InputName": "Parent", @@ -1281,8 +1218,7 @@ "Name": "unsharded_fk_allow", "Sharded": false }, - "Query": "delete from u_tbl2 where u_tbl2.id in ::dml_vals", - "Table": "u_tbl2" + "Query": "delete from u_tbl2 where u_tbl2.id in ::dml_vals" } ] } @@ -1326,7 +1262,6 @@ "JoinVars": { "tbl3_colx": 0 }, - "TableName": "tbl3_tbl1", "Inputs": [ { "OperatorType": "Route", @@ -1336,8 +1271,7 @@ "Sharded": true }, "FieldQuery": "select tbl3.colx from tbl3 where 1 != 1", - "Query": "select tbl3.colx from tbl3 where tbl3.colx + 10 is not null and not (tbl3.coly) <=> (tbl3.colx + 10) and tbl3.coly = 10 for share", - "Table": "tbl3" + "Query": "select tbl3.colx from tbl3 where tbl3.colx + 10 is not null and not (tbl3.coly) <=> (tbl3.colx + 10) and tbl3.coly = 10 for share" }, { "OperatorType": "Route", @@ -1347,8 +1281,7 @@ "Sharded": true }, "FieldQuery": "select tbl1.t1col1 from tbl1 where 1 != 1", - "Query": "select tbl1.t1col1 from tbl1 where tbl1.t1col1 = :tbl3_colx + 10 for share", - "Table": "tbl1" + "Query": "select tbl1.t1col1 from tbl1 where tbl1.t1col1 = :tbl3_colx + 10 for share" } ] } @@ -1366,8 +1299,7 @@ "Name": "sharded_fk_allow", "Sharded": true }, - "Query": "update /*+ SET_VAR(foreign_key_checks=OFF) */ tbl3 set coly = colx + 10 where coly = 10", - "Table": "tbl3" + "Query": "update /*+ SET_VAR(foreign_key_checks=OFF) */ tbl3 set coly = colx + 10 where coly = 10" } ] }, @@ -1406,7 +1338,6 @@ "OperatorType": "Join", "Variant": "LeftJoin", "JoinColumnIndexes": "R:0", - "TableName": "tbl3_tbl1", "Inputs": [ { "OperatorType": "Route", @@ -1416,8 +1347,7 @@ "Sharded": true }, "FieldQuery": "select 1 from tbl3 where 1 != 1", - "Query": "select 1 from tbl3 where not (tbl3.coly) <=> (20) and tbl3.coly = 10 for share", - "Table": "tbl3" + "Query": "select 1 from tbl3 where not (tbl3.coly) <=> (20) and tbl3.coly = 10 for share" }, { "OperatorType": "Route", @@ -1427,8 +1357,7 @@ "Sharded": true }, "FieldQuery": "select tbl1.t1col1 from tbl1 where 1 != 1", - "Query": "select tbl1.t1col1 from tbl1 where tbl1.t1col1 = 20 for share", - "Table": "tbl1" + "Query": "select tbl1.t1col1 from tbl1 where tbl1.t1col1 = 20 for share" } ] } @@ -1446,8 +1375,7 @@ "Name": "sharded_fk_allow", "Sharded": true }, - "Query": "update tbl3 set coly = 20 where coly = 10", - "Table": "tbl3" + "Query": "update tbl3 set coly = 20 where coly = 10" } ] }, @@ -1476,8 +1404,7 @@ "Sharded": false }, "FieldQuery": "select u_tbl6.col6 from u_tbl6 where 1 != 1", - "Query": "select u_tbl6.col6 from u_tbl6 for update", - "Table": "u_tbl6" + "Query": "select u_tbl6.col6 from u_tbl6 for update" }, { "InputName": "CascadeChild-1", @@ -1496,8 +1423,7 @@ "Sharded": false }, "FieldQuery": "select 1 from u_tbl8 left join u_tbl9 on u_tbl9.col9 = cast('foo' as CHAR) where 1 != 1", - "Query": "select 1 from u_tbl8 left join u_tbl9 on u_tbl9.col9 = cast('foo' as CHAR) where u_tbl9.col9 is null and not (u_tbl8.col8) <=> (cast('foo' as CHAR)) and (u_tbl8.col8) in ::fkc_vals limit 1 for share nowait", - "Table": "u_tbl8, u_tbl9" + "Query": "select 1 from u_tbl8 left join u_tbl9 on u_tbl9.col9 = cast('foo' as CHAR) where u_tbl9.col9 is null and not (u_tbl8.col8) <=> (cast('foo' as CHAR)) and (u_tbl8.col8) in ::fkc_vals limit 1 for share nowait" }, { "InputName": "PostVerify", @@ -1507,8 +1433,7 @@ "Name": "unsharded_fk_allow", "Sharded": false }, - "Query": "update /*+ SET_VAR(foreign_key_checks=OFF) */ u_tbl8 set col8 = 'foo' where (col8) in ::fkc_vals", - "Table": "u_tbl8" + "Query": "update /*+ SET_VAR(foreign_key_checks=OFF) */ u_tbl8 set col8 = 'foo' where (col8) in ::fkc_vals" } ] }, @@ -1520,8 +1445,7 @@ "Name": "unsharded_fk_allow", "Sharded": false }, - "Query": "update u_tbl6 set col6 = 'foo'", - "Table": "u_tbl6" + "Query": "update u_tbl6 set col6 = 'foo'" } ] }, @@ -1551,8 +1475,7 @@ "Sharded": false }, "FieldQuery": "select u_tbl7.col7 from u_tbl7 where 1 != 1", - "Query": "select u_tbl7.col7 from u_tbl7 for update", - "Table": "u_tbl7" + "Query": "select u_tbl7.col7 from u_tbl7 for update" }, { "InputName": "CascadeChild-1", @@ -1571,8 +1494,7 @@ "Sharded": false }, "FieldQuery": "select 1 from u_tbl4 left join u_tbl3 on u_tbl3.col3 = cast('foo' as CHAR) where 1 != 1", - "Query": "select 1 from u_tbl4 left join u_tbl3 on u_tbl3.col3 = cast('foo' as CHAR) where u_tbl3.col3 is null and not (u_tbl4.col4) <=> (cast('foo' as CHAR)) and (u_tbl4.col4) in ::fkc_vals limit 1 for share", - "Table": "u_tbl3, u_tbl4" + "Query": "select 1 from u_tbl4 left join u_tbl3 on u_tbl3.col3 = cast('foo' as CHAR) where u_tbl3.col3 is null and not (u_tbl4.col4) <=> (cast('foo' as CHAR)) and (u_tbl4.col4) in ::fkc_vals limit 1 for share" }, { "InputName": "VerifyChild-2", @@ -1583,8 +1505,7 @@ "Sharded": false }, "FieldQuery": "select 1 from u_tbl4, u_tbl9 where 1 != 1", - "Query": "select 1 from u_tbl4, u_tbl9 where u_tbl4.col4 = u_tbl9.col9 and (u_tbl4.col4) in ::fkc_vals and (u_tbl9.col9) not in ((cast('foo' as CHAR))) limit 1 for share", - "Table": "u_tbl4, u_tbl9" + "Query": "select 1 from u_tbl4, u_tbl9 where u_tbl4.col4 = u_tbl9.col9 and (u_tbl4.col4) in ::fkc_vals and (u_tbl9.col9) not in ((cast('foo' as CHAR))) limit 1 for share" }, { "InputName": "PostVerify", @@ -1594,8 +1515,7 @@ "Name": "unsharded_fk_allow", "Sharded": false }, - "Query": "update /*+ SET_VAR(foreign_key_checks=OFF) */ u_tbl4 set col4 = 'foo' where (col4) in ::fkc_vals", - "Table": "u_tbl4" + "Query": "update /*+ SET_VAR(foreign_key_checks=OFF) */ u_tbl4 set col4 = 'foo' where (col4) in ::fkc_vals" } ] }, @@ -1607,8 +1527,7 @@ "Name": "unsharded_fk_allow", "Sharded": false }, - "Query": "update u_tbl7 set col7 = 'foo'", - "Table": "u_tbl7" + "Query": "update u_tbl7 set col7 = 'foo'" } ] }, @@ -1639,8 +1558,7 @@ "Sharded": false }, "FieldQuery": "select u_tbl7.col7 from u_tbl7 where 1 != 1", - "Query": "select u_tbl7.col7 from u_tbl7 for update", - "Table": "u_tbl7" + "Query": "select u_tbl7.col7 from u_tbl7 for update" }, { "InputName": "CascadeChild-1", @@ -1659,8 +1577,7 @@ "Sharded": false }, "FieldQuery": "select 1 from u_tbl4 left join u_tbl3 on u_tbl3.col3 = cast(:v1 as CHAR) where 1 != 1", - "Query": "select 1 from u_tbl4 left join u_tbl3 on u_tbl3.col3 = cast(:v1 as CHAR) where u_tbl3.col3 is null and cast(:v1 as CHAR) is not null and not (u_tbl4.col4) <=> (cast(:v1 as CHAR)) and (u_tbl4.col4) in ::fkc_vals limit 1 for share", - "Table": "u_tbl3, u_tbl4" + "Query": "select 1 from u_tbl4 left join u_tbl3 on u_tbl3.col3 = cast(:v1 as CHAR) where u_tbl3.col3 is null and cast(:v1 as CHAR) is not null and not (u_tbl4.col4) <=> (cast(:v1 as CHAR)) and (u_tbl4.col4) in ::fkc_vals limit 1 for share" }, { "InputName": "VerifyChild-2", @@ -1671,8 +1588,7 @@ "Sharded": false }, "FieldQuery": "select 1 from u_tbl4, u_tbl9 where 1 != 1", - "Query": "select 1 from u_tbl4, u_tbl9 where u_tbl4.col4 = u_tbl9.col9 and (u_tbl4.col4) in ::fkc_vals and (cast(:v1 as CHAR) is null or (u_tbl9.col9) not in ((cast(:v1 as CHAR)))) limit 1 for share", - "Table": "u_tbl4, u_tbl9" + "Query": "select 1 from u_tbl4, u_tbl9 where u_tbl4.col4 = u_tbl9.col9 and (u_tbl4.col4) in ::fkc_vals and (cast(:v1 as CHAR) is null or (u_tbl9.col9) not in ((cast(:v1 as CHAR)))) limit 1 for share" }, { "InputName": "PostVerify", @@ -1682,8 +1598,7 @@ "Name": "unsharded_fk_allow", "Sharded": false }, - "Query": "update /*+ SET_VAR(foreign_key_checks=OFF) */ u_tbl4 set col4 = :v1 where (col4) in ::fkc_vals", - "Table": "u_tbl4" + "Query": "update /*+ SET_VAR(foreign_key_checks=OFF) */ u_tbl4 set col4 = :v1 where (col4) in ::fkc_vals" } ] }, @@ -1695,8 +1610,7 @@ "Name": "unsharded_fk_allow", "Sharded": false }, - "Query": "update u_tbl7 set col7 = :v1", - "Table": "u_tbl7" + "Query": "update u_tbl7 set col7 = :v1" } ] }, @@ -1727,8 +1641,7 @@ "Sharded": false }, "NoAutoCommit": true, - "Query": "insert into u_tbl1(id, col1) values (1, 3)", - "TableName": "u_tbl1" + "Query": "insert into u_tbl1(id, col1) values (1, 3)" }, { "InputName": "Update-1", @@ -1743,8 +1656,7 @@ "Sharded": false }, "FieldQuery": "select u_tbl1.col1 from u_tbl1 where 1 != 1", - "Query": "select u_tbl1.col1 from u_tbl1 where id = 1 for update", - "Table": "u_tbl1" + "Query": "select u_tbl1.col1 from u_tbl1 where id = 1 for update" }, { "InputName": "CascadeChild-1", @@ -1763,8 +1675,7 @@ "Sharded": false }, "FieldQuery": "select u_tbl2.col2 from u_tbl2 where 1 != 1", - "Query": "select u_tbl2.col2 from u_tbl2 where (col2) in ::fkc_vals for update", - "Table": "u_tbl2" + "Query": "select u_tbl2.col2 from u_tbl2 where (col2) in ::fkc_vals for update" }, { "InputName": "CascadeChild-1", @@ -1778,8 +1689,7 @@ "Cols": [ 0 ], - "Query": "update u_tbl3 set col3 = null where (col3) in ::fkc_vals1 and (col3) not in ((cast(5 as CHAR)))", - "Table": "u_tbl3" + "Query": "update u_tbl3 set col3 = null where (col3) in ::fkc_vals1 and (col3) not in ((cast(5 as CHAR)))" }, { "InputName": "Parent", @@ -1789,8 +1699,7 @@ "Name": "unsharded_fk_allow", "Sharded": false }, - "Query": "update /*+ SET_VAR(foreign_key_checks=OFF) */ u_tbl2 set col2 = 5 where (col2) in ::fkc_vals", - "Table": "u_tbl2" + "Query": "update /*+ SET_VAR(foreign_key_checks=OFF) */ u_tbl2 set col2 = 5 where (col2) in ::fkc_vals" } ] }, @@ -1811,8 +1720,7 @@ "Sharded": false }, "FieldQuery": "select u_tbl9.col9 from u_tbl9 where 1 != 1", - "Query": "select u_tbl9.col9 from u_tbl9 where (col9) in ::fkc_vals2 and (col9) not in ((cast(5 as CHAR))) for update nowait", - "Table": "u_tbl9" + "Query": "select u_tbl9.col9 from u_tbl9 where (col9) in ::fkc_vals2 and (col9) not in ((cast(5 as CHAR))) for update nowait" }, { "InputName": "CascadeChild-1", @@ -1826,8 +1734,7 @@ "Cols": [ 0 ], - "Query": "update u_tbl8 set col8 = null where (col8) in ::fkc_vals3", - "Table": "u_tbl8" + "Query": "update u_tbl8 set col8 = null where (col8) in ::fkc_vals3" }, { "InputName": "Parent", @@ -1837,8 +1744,7 @@ "Name": "unsharded_fk_allow", "Sharded": false }, - "Query": "update u_tbl9 set col9 = null where (col9) in ::fkc_vals2 and (col9) not in ((cast(5 as CHAR)))", - "Table": "u_tbl9" + "Query": "update u_tbl9 set col9 = null where (col9) in ::fkc_vals2 and (col9) not in ((cast(5 as CHAR)))" } ] }, @@ -1850,8 +1756,7 @@ "Name": "unsharded_fk_allow", "Sharded": false }, - "Query": "update u_tbl1 set col1 = 5 where id = 1", - "Table": "u_tbl1" + "Query": "update u_tbl1 set col1 = 5 where id = 1" } ] } @@ -1880,8 +1785,7 @@ "Name": "unsharded_fk_allow", "Sharded": false }, - "Query": "insert into u_tbl1(id, col1, foo) values (1, 3, 'bar') on duplicate key update foo = 'baz'", - "TableName": "u_tbl1" + "Query": "insert into u_tbl1(id, col1, foo) values (1, 3, 'bar') on duplicate key update foo = 'baz'" }, "TablesUsed": [ "unsharded_fk_allow.u_tbl1" @@ -1915,8 +1819,7 @@ "Sharded": false }, "FieldQuery": "select u_tbl1.col1 from u_tbl1 where 1 != 1", - "Query": "select u_tbl1.col1 from u_tbl1 where (id) in ((1)) for update", - "Table": "u_tbl1" + "Query": "select u_tbl1.col1 from u_tbl1 where (id) in ((1)) for update" }, { "InputName": "CascadeChild-1", @@ -1935,8 +1838,7 @@ "Sharded": false }, "FieldQuery": "select u_tbl2.col2 from u_tbl2 where 1 != 1", - "Query": "select u_tbl2.col2 from u_tbl2 where (col2) in ::fkc_vals for update", - "Table": "u_tbl2" + "Query": "select u_tbl2.col2 from u_tbl2 where (col2) in ::fkc_vals for update" }, { "InputName": "CascadeChild-1", @@ -1950,8 +1852,7 @@ "Cols": [ 0 ], - "Query": "update u_tbl3 set col3 = null where (col3) in ::fkc_vals1", - "Table": "u_tbl3" + "Query": "update u_tbl3 set col3 = null where (col3) in ::fkc_vals1" }, { "InputName": "Parent", @@ -1961,8 +1862,7 @@ "Name": "unsharded_fk_allow", "Sharded": false }, - "Query": "delete from u_tbl2 where (col2) in ::fkc_vals", - "Table": "u_tbl2" + "Query": "delete from u_tbl2 where (col2) in ::fkc_vals" } ] }, @@ -1974,8 +1874,7 @@ "Name": "unsharded_fk_allow", "Sharded": false }, - "Query": "delete from u_tbl1 where (id) in ((1))", - "Table": "u_tbl1" + "Query": "delete from u_tbl1 where (id) in ((1))" } ] }, @@ -1987,8 +1886,7 @@ "Sharded": false }, "NoAutoCommit": true, - "Query": "insert into u_tbl1(id, col1) values (1, 2)", - "TableName": "u_tbl1" + "Query": "insert into u_tbl1(id, col1) values (1, 2)" } ] }, @@ -2018,8 +1916,7 @@ "Sharded": false }, "FieldQuery": "select u_multicol_tbl1.cola, u_multicol_tbl1.colb from u_multicol_tbl1 where 1 != 1", - "Query": "select u_multicol_tbl1.cola, u_multicol_tbl1.colb from u_multicol_tbl1 where id = 3 for update", - "Table": "u_multicol_tbl1" + "Query": "select u_multicol_tbl1.cola, u_multicol_tbl1.colb from u_multicol_tbl1 where id = 3 for update" }, { "InputName": "CascadeChild-1", @@ -2039,8 +1936,7 @@ "Sharded": false }, "FieldQuery": "select u_multicol_tbl2.cola, u_multicol_tbl2.colb from u_multicol_tbl2 where 1 != 1", - "Query": "select u_multicol_tbl2.cola, u_multicol_tbl2.colb from u_multicol_tbl2 where (cola, colb) in ::fkc_vals and (cola, colb) not in ((1, 2)) for update", - "Table": "u_multicol_tbl2" + "Query": "select u_multicol_tbl2.cola, u_multicol_tbl2.colb from u_multicol_tbl2 where (cola, colb) in ::fkc_vals and (cola, colb) not in ((1, 2)) for update" }, { "InputName": "CascadeChild-1", @@ -2055,8 +1951,7 @@ 0, 1 ], - "Query": "update /*+ SET_VAR(foreign_key_checks=OFF) */ u_multicol_tbl3 set cola = null, colb = null where (cola, colb) in ::fkc_vals1", - "Table": "u_multicol_tbl3" + "Query": "update /*+ SET_VAR(foreign_key_checks=OFF) */ u_multicol_tbl3 set cola = null, colb = null where (cola, colb) in ::fkc_vals1" }, { "InputName": "Parent", @@ -2066,8 +1961,7 @@ "Name": "unsharded_fk_allow", "Sharded": false }, - "Query": "update u_multicol_tbl2 set cola = null, colb = null where (cola, colb) in ::fkc_vals and (cola, colb) not in ((1, 2))", - "Table": "u_multicol_tbl2" + "Query": "update u_multicol_tbl2 set cola = null, colb = null where (cola, colb) in ::fkc_vals and (cola, colb) not in ((1, 2))" } ] }, @@ -2079,8 +1973,7 @@ "Name": "unsharded_fk_allow", "Sharded": false }, - "Query": "update u_multicol_tbl1 set cola = 1, colb = 2 where id = 3", - "Table": "u_multicol_tbl1" + "Query": "update u_multicol_tbl1 set cola = 1, colb = 2 where id = 3" } ] }, @@ -2110,8 +2003,7 @@ "Sharded": false }, "FieldQuery": "select u_multicol_tbl1.cola, u_multicol_tbl1.colb from u_multicol_tbl1 where 1 != 1", - "Query": "select u_multicol_tbl1.cola, u_multicol_tbl1.colb from u_multicol_tbl1 where id = :v3 for update", - "Table": "u_multicol_tbl1" + "Query": "select u_multicol_tbl1.cola, u_multicol_tbl1.colb from u_multicol_tbl1 where id = :v3 for update" }, { "InputName": "CascadeChild-1", @@ -2131,8 +2023,7 @@ "Sharded": false }, "FieldQuery": "select u_multicol_tbl2.cola, u_multicol_tbl2.colb from u_multicol_tbl2 where 1 != 1", - "Query": "select u_multicol_tbl2.cola, u_multicol_tbl2.colb from u_multicol_tbl2 where (cola, colb) in ::fkc_vals and (:v2 is null or (:v1 is null or (cola, colb) not in ((:v1, :v2)))) for update", - "Table": "u_multicol_tbl2" + "Query": "select u_multicol_tbl2.cola, u_multicol_tbl2.colb from u_multicol_tbl2 where (cola, colb) in ::fkc_vals and (:v2 is null or (:v1 is null or (cola, colb) not in ((:v1, :v2)))) for update" }, { "InputName": "CascadeChild-1", @@ -2147,8 +2038,7 @@ 0, 1 ], - "Query": "update /*+ SET_VAR(foreign_key_checks=OFF) */ u_multicol_tbl3 set cola = null, colb = null where (cola, colb) in ::fkc_vals1", - "Table": "u_multicol_tbl3" + "Query": "update /*+ SET_VAR(foreign_key_checks=OFF) */ u_multicol_tbl3 set cola = null, colb = null where (cola, colb) in ::fkc_vals1" }, { "InputName": "Parent", @@ -2158,8 +2048,7 @@ "Name": "unsharded_fk_allow", "Sharded": false }, - "Query": "update u_multicol_tbl2 set cola = null, colb = null where (cola, colb) in ::fkc_vals and (:v2 is null or (:v1 is null or (cola, colb) not in ((:v1, :v2))))", - "Table": "u_multicol_tbl2" + "Query": "update u_multicol_tbl2 set cola = null, colb = null where (cola, colb) in ::fkc_vals and (:v2 is null or (:v1 is null or (cola, colb) not in ((:v1, :v2))))" } ] }, @@ -2171,8 +2060,7 @@ "Name": "unsharded_fk_allow", "Sharded": false }, - "Query": "update u_multicol_tbl1 set cola = :v1, colb = :v2 where id = :v3", - "Table": "u_multicol_tbl1" + "Query": "update u_multicol_tbl1 set cola = :v1, colb = :v2 where id = :v3" } ] }, @@ -2208,8 +2096,7 @@ "Sharded": true }, "FieldQuery": "select tbl5.col5, tbl5.t5col5 from tbl5 where 1 != 1", - "Query": "select tbl5.col5, tbl5.t5col5 from tbl5 where id = :v1 for update", - "Table": "tbl5" + "Query": "select tbl5.col5, tbl5.t5col5 from tbl5 where id = :v1 for update" }, { "InputName": "CascadeChild-1", @@ -2224,7 +2111,6 @@ 0 ], "Query": "delete from tbl4 where (col4) in ::fkc_vals", - "Table": "tbl4", "Values": [ "fkc_vals:0" ], @@ -2242,8 +2128,7 @@ "Cols": [ 1 ], - "Query": "delete from tbl4 where (t4col4) in ::fkc_vals1", - "Table": "tbl4" + "Query": "delete from tbl4 where (t4col4) in ::fkc_vals1" }, { "InputName": "Parent", @@ -2253,8 +2138,7 @@ "Name": "sharded_fk_allow", "Sharded": true }, - "Query": "delete from tbl5 where id = :v1", - "Table": "tbl5" + "Query": "delete from tbl5 where id = :v1" } ] } @@ -2290,8 +2174,7 @@ "Sharded": false }, "FieldQuery": "select u_tbl7.col7, col7 <=> cast(baz + 1 + col7 as CHAR), cast(baz + 1 + col7 as CHAR) from u_tbl7 where 1 != 1", - "Query": "select u_tbl7.col7, col7 <=> cast(baz + 1 + col7 as CHAR), cast(baz + 1 + col7 as CHAR) from u_tbl7 where bar = 42 for update", - "Table": "u_tbl7" + "Query": "select u_tbl7.col7, col7 <=> cast(baz + 1 + col7 as CHAR), cast(baz + 1 + col7 as CHAR) from u_tbl7 where bar = 42 for update" }, { "InputName": "CascadeChild-1", @@ -2317,8 +2200,7 @@ "Sharded": false }, "FieldQuery": "select 1 from u_tbl4 left join u_tbl3 on u_tbl3.col3 = cast(:fkc_upd as CHAR) where 1 != 1", - "Query": "select 1 from u_tbl4 left join u_tbl3 on u_tbl3.col3 = cast(:fkc_upd as CHAR) where u_tbl3.col3 is null and cast(:fkc_upd as CHAR) is not null and not (u_tbl4.col4) <=> (cast(:fkc_upd as CHAR)) and (u_tbl4.col4) in ::fkc_vals limit 1 for share", - "Table": "u_tbl3, u_tbl4" + "Query": "select 1 from u_tbl4 left join u_tbl3 on u_tbl3.col3 = cast(:fkc_upd as CHAR) where u_tbl3.col3 is null and cast(:fkc_upd as CHAR) is not null and not (u_tbl4.col4) <=> (cast(:fkc_upd as CHAR)) and (u_tbl4.col4) in ::fkc_vals limit 1 for share" }, { "InputName": "VerifyChild-2", @@ -2329,8 +2211,7 @@ "Sharded": false }, "FieldQuery": "select 1 from u_tbl4, u_tbl9 where 1 != 1", - "Query": "select 1 from u_tbl4, u_tbl9 where u_tbl4.col4 = u_tbl9.col9 and (u_tbl4.col4) in ::fkc_vals and (cast(:fkc_upd as CHAR) is null or (u_tbl9.col9) not in ((cast(:fkc_upd as CHAR)))) limit 1 for share", - "Table": "u_tbl4, u_tbl9" + "Query": "select 1 from u_tbl4, u_tbl9 where u_tbl4.col4 = u_tbl9.col9 and (u_tbl4.col4) in ::fkc_vals and (cast(:fkc_upd as CHAR) is null or (u_tbl9.col9) not in ((cast(:fkc_upd as CHAR)))) limit 1 for share" }, { "InputName": "PostVerify", @@ -2340,8 +2221,7 @@ "Name": "unsharded_fk_allow", "Sharded": false }, - "Query": "update /*+ SET_VAR(foreign_key_checks=OFF) */ u_tbl4 set col4 = :fkc_upd where (col4) in ::fkc_vals", - "Table": "u_tbl4" + "Query": "update /*+ SET_VAR(foreign_key_checks=OFF) */ u_tbl4 set col4 = :fkc_upd where (col4) in ::fkc_vals" } ] }, @@ -2353,8 +2233,7 @@ "Name": "unsharded_fk_allow", "Sharded": false }, - "Query": "update /*+ SET_VAR(foreign_key_checks=OFF) */ u_tbl7 set foo = 100, col7 = baz + 1 + col7 where bar = 42", - "Table": "u_tbl7" + "Query": "update /*+ SET_VAR(foreign_key_checks=OFF) */ u_tbl7 set foo = 100, col7 = baz + 1 + col7 where bar = 42" } ] }, @@ -2385,8 +2264,7 @@ "Sharded": false }, "FieldQuery": "select u_multicol_tbl1.cola, u_multicol_tbl1.colb, cola <=> cola + 3, cola + 3 from u_multicol_tbl1 where 1 != 1", - "Query": "select u_multicol_tbl1.cola, u_multicol_tbl1.colb, cola <=> cola + 3, cola + 3 from u_multicol_tbl1 where id = 3 for update", - "Table": "u_multicol_tbl1" + "Query": "select u_multicol_tbl1.cola, u_multicol_tbl1.colb, cola <=> cola + 3, cola + 3 from u_multicol_tbl1 where id = 3 for update" }, { "InputName": "CascadeChild-1", @@ -2413,8 +2291,7 @@ "Sharded": false }, "FieldQuery": "select u_multicol_tbl2.cola, u_multicol_tbl2.colb from u_multicol_tbl2 where 1 != 1", - "Query": "select u_multicol_tbl2.cola, u_multicol_tbl2.colb from u_multicol_tbl2 where (cola, colb) in ::fkc_vals and (:fkc_upd is null or (cola) not in ((:fkc_upd))) for update", - "Table": "u_multicol_tbl2" + "Query": "select u_multicol_tbl2.cola, u_multicol_tbl2.colb from u_multicol_tbl2 where (cola, colb) in ::fkc_vals and (:fkc_upd is null or (cola) not in ((:fkc_upd))) for update" }, { "InputName": "CascadeChild-1", @@ -2429,8 +2306,7 @@ 0, 1 ], - "Query": "update /*+ SET_VAR(foreign_key_checks=OFF) */ u_multicol_tbl3 set cola = null, colb = null where (cola, colb) in ::fkc_vals1", - "Table": "u_multicol_tbl3" + "Query": "update /*+ SET_VAR(foreign_key_checks=OFF) */ u_multicol_tbl3 set cola = null, colb = null where (cola, colb) in ::fkc_vals1" }, { "InputName": "Parent", @@ -2440,8 +2316,7 @@ "Name": "unsharded_fk_allow", "Sharded": false }, - "Query": "update u_multicol_tbl2 set cola = null, colb = null where (cola, colb) in ::fkc_vals and (:fkc_upd is null or (cola) not in ((:fkc_upd)))", - "Table": "u_multicol_tbl2" + "Query": "update u_multicol_tbl2 set cola = null, colb = null where (cola, colb) in ::fkc_vals and (:fkc_upd is null or (cola) not in ((:fkc_upd)))" } ] }, @@ -2453,8 +2328,7 @@ "Name": "unsharded_fk_allow", "Sharded": false }, - "Query": "update /*+ SET_VAR(foreign_key_checks=OFF) */ u_multicol_tbl1 set cola = cola + 3 where id = 3", - "Table": "u_multicol_tbl1" + "Query": "update /*+ SET_VAR(foreign_key_checks=OFF) */ u_multicol_tbl1 set cola = cola + 3 where id = 3" } ] }, @@ -2489,8 +2363,7 @@ "Sharded": false }, "FieldQuery": "select 1 from u_multicol_tbl2 left join u_multicol_tbl1 on u_multicol_tbl1.cola = 2 and u_multicol_tbl1.colb = u_multicol_tbl2.colc - 2 where 1 != 1", - "Query": "select 1 from u_multicol_tbl2 left join u_multicol_tbl1 on u_multicol_tbl1.cola = 2 and u_multicol_tbl1.colb = u_multicol_tbl2.colc - 2 where u_multicol_tbl1.cola is null and u_multicol_tbl1.colb is null and u_multicol_tbl2.colc - 2 is not null and not (u_multicol_tbl2.cola, u_multicol_tbl2.colb) <=> (2, u_multicol_tbl2.colc - 2) and u_multicol_tbl2.id = 7 limit 1 for share", - "Table": "u_multicol_tbl1, u_multicol_tbl2" + "Query": "select 1 from u_multicol_tbl2 left join u_multicol_tbl1 on u_multicol_tbl1.cola = 2 and u_multicol_tbl1.colb = u_multicol_tbl2.colc - 2 where u_multicol_tbl1.cola is null and u_multicol_tbl1.colb is null and u_multicol_tbl2.colc - 2 is not null and not (u_multicol_tbl2.cola, u_multicol_tbl2.colb) <=> (2, u_multicol_tbl2.colc - 2) and u_multicol_tbl2.id = 7 limit 1 for share" }, { "InputName": "PostVerify", @@ -2505,8 +2378,7 @@ "Sharded": false }, "FieldQuery": "select u_multicol_tbl2.cola, u_multicol_tbl2.colb, cola <=> 2, 2, colb <=> colc - 2, colc - 2 from u_multicol_tbl2 where 1 != 1", - "Query": "select u_multicol_tbl2.cola, u_multicol_tbl2.colb, cola <=> 2, 2, colb <=> colc - 2, colc - 2 from u_multicol_tbl2 where id = 7 for update", - "Table": "u_multicol_tbl2" + "Query": "select u_multicol_tbl2.cola, u_multicol_tbl2.colb, cola <=> 2, 2, colb <=> colc - 2, colc - 2 from u_multicol_tbl2 where id = 7 for update" }, { "InputName": "CascadeChild-1", @@ -2533,8 +2405,7 @@ "UpdateExprBvName": "fkc_upd1" } ], - "Query": "update /*+ SET_VAR(foreign_key_checks=OFF) */ u_multicol_tbl3 set cola = :fkc_upd, colb = :fkc_upd1 where (cola, colb) in ::fkc_vals", - "Table": "u_multicol_tbl3" + "Query": "update /*+ SET_VAR(foreign_key_checks=OFF) */ u_multicol_tbl3 set cola = :fkc_upd, colb = :fkc_upd1 where (cola, colb) in ::fkc_vals" }, { "InputName": "Parent", @@ -2544,8 +2415,7 @@ "Name": "unsharded_fk_allow", "Sharded": false }, - "Query": "update /*+ SET_VAR(foreign_key_checks=OFF) */ u_multicol_tbl2 set cola = 2, colb = colc - 2 where id = 7", - "Table": "u_multicol_tbl2" + "Query": "update /*+ SET_VAR(foreign_key_checks=OFF) */ u_multicol_tbl2 set cola = 2, colb = colc - 2 where id = 7" } ] } @@ -2580,8 +2450,7 @@ "Sharded": false }, "FieldQuery": "select u_tbl9.col9 from u_tbl9 where 1 != 1", - "Query": "select u_tbl9.col9 from u_tbl9 where (col9) in ((10), (20), (30)) or (col9 * foo) in ((10 * null), (20 * null), (30 * null)) or (bar, col9) in ((1, 10), (1, 20), (1, 30)) or (id) in ((1), (2), (3)) for update nowait", - "Table": "u_tbl9" + "Query": "select u_tbl9.col9 from u_tbl9 where (col9) in ((10), (20), (30)) or (col9 * foo) in ((10 * null), (20 * null), (30 * null)) or (bar, col9) in ((1, 10), (1, 20), (1, 30)) or (id) in ((1), (2), (3)) for update nowait" }, { "InputName": "CascadeChild-1", @@ -2595,8 +2464,7 @@ "Cols": [ 0 ], - "Query": "update u_tbl8 set col8 = null where (col8) in ::fkc_vals", - "Table": "u_tbl8" + "Query": "update u_tbl8 set col8 = null where (col8) in ::fkc_vals" }, { "InputName": "Parent", @@ -2606,8 +2474,7 @@ "Name": "unsharded_fk_allow", "Sharded": false }, - "Query": "delete from u_tbl9 where (col9) in ((10), (20), (30)) or (col9 * foo) in ((10 * null), (20 * null), (30 * null)) or (bar, col9) in ((1, 10), (1, 20), (1, 30)) or (id) in ((1), (2), (3))", - "Table": "u_tbl9" + "Query": "delete from u_tbl9 where (col9) in ((10), (20), (30)) or (col9 * foo) in ((10 * null), (20 * null), (30 * null)) or (bar, col9) in ((1, 10), (1, 20), (1, 30)) or (id) in ((1), (2), (3))" } ] }, @@ -2619,8 +2486,7 @@ "Sharded": false }, "NoAutoCommit": true, - "Query": "insert into u_tbl9(id, col9) values (1, 10), (2, 20), (3, 30)", - "TableName": "u_tbl9" + "Query": "insert into u_tbl9(id, col9) values (1, 10), (2, 20), (3, 30)" } ] }, @@ -2645,7 +2511,6 @@ "Sharded": true }, "Query": "delete /*+ SET_VAR(foreign_key_checks=Off) */ from multicol_tbl1 where cola = 1 and colb = 2 and colc = 3", - "Table": "multicol_tbl1", "Values": [ "1", "2", @@ -2672,8 +2537,7 @@ "Name": "unsharded_fk_allow", "Sharded": false }, - "Query": "update /*+ SET_VAR(foreign_key_checks=Off) */ u_multicol_tbl1 set cola = 1, colb = 2 where id = 3", - "Table": "u_multicol_tbl1" + "Query": "update /*+ SET_VAR(foreign_key_checks=Off) */ u_multicol_tbl1 set cola = 1, colb = 2 where id = 3" }, "TablesUsed": [ "unsharded_fk_allow.u_multicol_tbl1" @@ -2695,7 +2559,6 @@ "Sharded": true }, "Query": "insert /*+ SET_VAR(foreign_key_checks=Off) */ into tbl3(col3, coly) values (:_col3_0, 3)", - "TableName": "tbl3", "VindexValues": { "hash_vin": "1" } @@ -2724,8 +2587,7 @@ "Sharded": false }, "NoAutoCommit": true, - "Query": "insert into u_tbl1(id, col1) values (1, 3)", - "TableName": "u_tbl1" + "Query": "insert into u_tbl1(id, col1) values (1, 3)" }, { "InputName": "Update-1", @@ -2740,8 +2602,7 @@ "Sharded": false }, "FieldQuery": "select u_tbl1.col1 from u_tbl1 where 1 != 1", - "Query": "select u_tbl1.col1 from u_tbl1 where id = 1 for update", - "Table": "u_tbl1" + "Query": "select u_tbl1.col1 from u_tbl1 where id = 1 for update" }, { "InputName": "CascadeChild-1", @@ -2760,8 +2621,7 @@ "Sharded": false }, "FieldQuery": "select u_tbl2.col2 from u_tbl2 where 1 != 1", - "Query": "select u_tbl2.col2 from u_tbl2 where (col2) in ::fkc_vals for update", - "Table": "u_tbl2" + "Query": "select u_tbl2.col2 from u_tbl2 where (col2) in ::fkc_vals for update" }, { "InputName": "CascadeChild-1", @@ -2775,8 +2635,7 @@ "Cols": [ 0 ], - "Query": "update u_tbl3 set col3 = null where (col3) in ::fkc_vals1 and (col3) not in ((cast(3 as CHAR)))", - "Table": "u_tbl3" + "Query": "update u_tbl3 set col3 = null where (col3) in ::fkc_vals1 and (col3) not in ((cast(3 as CHAR)))" }, { "InputName": "Parent", @@ -2786,8 +2645,7 @@ "Name": "unsharded_fk_allow", "Sharded": false }, - "Query": "update /*+ SET_VAR(foreign_key_checks=OFF) */ u_tbl2 set col2 = 3 where (col2) in ::fkc_vals", - "Table": "u_tbl2" + "Query": "update /*+ SET_VAR(foreign_key_checks=OFF) */ u_tbl2 set col2 = 3 where (col2) in ::fkc_vals" } ] }, @@ -2808,8 +2666,7 @@ "Sharded": false }, "FieldQuery": "select u_tbl9.col9 from u_tbl9 where 1 != 1", - "Query": "select u_tbl9.col9 from u_tbl9 where (col9) in ::fkc_vals2 and (col9) not in ((cast(3 as CHAR))) for update nowait", - "Table": "u_tbl9" + "Query": "select u_tbl9.col9 from u_tbl9 where (col9) in ::fkc_vals2 and (col9) not in ((cast(3 as CHAR))) for update nowait" }, { "InputName": "CascadeChild-1", @@ -2823,8 +2680,7 @@ "Cols": [ 0 ], - "Query": "update u_tbl8 set col8 = null where (col8) in ::fkc_vals3", - "Table": "u_tbl8" + "Query": "update u_tbl8 set col8 = null where (col8) in ::fkc_vals3" }, { "InputName": "Parent", @@ -2834,8 +2690,7 @@ "Name": "unsharded_fk_allow", "Sharded": false }, - "Query": "update u_tbl9 set col9 = null where (col9) in ::fkc_vals2 and (col9) not in ((cast(3 as CHAR)))", - "Table": "u_tbl9" + "Query": "update u_tbl9 set col9 = null where (col9) in ::fkc_vals2 and (col9) not in ((cast(3 as CHAR)))" } ] }, @@ -2847,8 +2702,7 @@ "Name": "unsharded_fk_allow", "Sharded": false }, - "Query": "update u_tbl1 set col1 = 3 where id = 1", - "Table": "u_tbl1" + "Query": "update u_tbl1 set col1 = 3 where id = 1" } ] } @@ -2882,8 +2736,7 @@ "Sharded": false }, "NoAutoCommit": true, - "Query": "insert into u_tbl2(id, col2) values (:v1, :v2)", - "TableName": "u_tbl2" + "Query": "insert into u_tbl2(id, col2) values (:v1, :v2)" }, { "InputName": "Update-1", @@ -2898,8 +2751,7 @@ "Sharded": false }, "FieldQuery": "select u_tbl2.col2 from u_tbl2 where 1 != 1", - "Query": "select u_tbl2.col2 from u_tbl2 where id = :v1 for update", - "Table": "u_tbl2" + "Query": "select u_tbl2.col2 from u_tbl2 where id = :v1 for update" }, { "InputName": "CascadeChild-1", @@ -2913,8 +2765,7 @@ "Cols": [ 0 ], - "Query": "update u_tbl3 set col3 = null where (col3) in ::fkc_vals and (cast(:v2 as CHAR) is null or (col3) not in ((cast(:v2 as CHAR))))", - "Table": "u_tbl3" + "Query": "update u_tbl3 set col3 = null where (col3) in ::fkc_vals and (cast(:v2 as CHAR) is null or (col3) not in ((cast(:v2 as CHAR))))" }, { "InputName": "Parent", @@ -2924,8 +2775,7 @@ "Name": "unsharded_fk_allow", "Sharded": false }, - "Query": "update u_tbl2 set col2 = :v2 where id = :v1", - "Table": "u_tbl2" + "Query": "update u_tbl2 set col2 = :v2 where id = :v1" } ] }, @@ -2938,8 +2788,7 @@ "Sharded": false }, "NoAutoCommit": true, - "Query": "insert into u_tbl2(id, col2) values (:v3, :v4)", - "TableName": "u_tbl2" + "Query": "insert into u_tbl2(id, col2) values (:v3, :v4)" }, { "InputName": "Update-2", @@ -2954,8 +2803,7 @@ "Sharded": false }, "FieldQuery": "select u_tbl2.col2 from u_tbl2 where 1 != 1", - "Query": "select u_tbl2.col2 from u_tbl2 where id = :v3 for update", - "Table": "u_tbl2" + "Query": "select u_tbl2.col2 from u_tbl2 where id = :v3 for update" }, { "InputName": "CascadeChild-1", @@ -2969,8 +2817,7 @@ "Cols": [ 0 ], - "Query": "update u_tbl3 set col3 = null where (col3) in ::fkc_vals1 and (cast(:v4 as CHAR) is null or (col3) not in ((cast(:v4 as CHAR))))", - "Table": "u_tbl3" + "Query": "update u_tbl3 set col3 = null where (col3) in ::fkc_vals1 and (cast(:v4 as CHAR) is null or (col3) not in ((cast(:v4 as CHAR))))" }, { "InputName": "Parent", @@ -2980,8 +2827,7 @@ "Name": "unsharded_fk_allow", "Sharded": false }, - "Query": "update u_tbl2 set col2 = :v4 where id = :v3", - "Table": "u_tbl2" + "Query": "update u_tbl2 set col2 = :v4 where id = :v3" } ] }, @@ -2994,8 +2840,7 @@ "Sharded": false }, "NoAutoCommit": true, - "Query": "insert into u_tbl2(id, col2) values (:v5, :v6)", - "TableName": "u_tbl2" + "Query": "insert into u_tbl2(id, col2) values (:v5, :v6)" }, { "InputName": "Update-3", @@ -3010,8 +2855,7 @@ "Sharded": false }, "FieldQuery": "select u_tbl2.col2 from u_tbl2 where 1 != 1", - "Query": "select u_tbl2.col2 from u_tbl2 where id = :v5 for update", - "Table": "u_tbl2" + "Query": "select u_tbl2.col2 from u_tbl2 where id = :v5 for update" }, { "InputName": "CascadeChild-1", @@ -3025,8 +2869,7 @@ "Cols": [ 0 ], - "Query": "update u_tbl3 set col3 = null where (col3) in ::fkc_vals2 and (cast(:v6 as CHAR) is null or (col3) not in ((cast(:v6 as CHAR))))", - "Table": "u_tbl3" + "Query": "update u_tbl3 set col3 = null where (col3) in ::fkc_vals2 and (cast(:v6 as CHAR) is null or (col3) not in ((cast(:v6 as CHAR))))" }, { "InputName": "Parent", @@ -3036,8 +2879,7 @@ "Name": "unsharded_fk_allow", "Sharded": false }, - "Query": "update u_tbl2 set col2 = :v6 where id = :v5", - "Table": "u_tbl2" + "Query": "update u_tbl2 set col2 = :v6 where id = :v5" } ] } @@ -3075,8 +2917,7 @@ "Sharded": false }, "FieldQuery": "select u.id from u_tbl6 as u, u_tbl5 as m where 1 != 1", - "Query": "select u.id from u_tbl6 as u, u_tbl5 as m where u.col2 = 4 and m.col3 = 6 and u.col = m.col for update", - "Table": "u_tbl5, u_tbl6" + "Query": "select u.id from u_tbl6 as u, u_tbl5 as m where u.col2 = 4 and m.col3 = 6 and u.col = m.col for update" }, { "OperatorType": "FkCascade", @@ -3090,8 +2931,7 @@ "Sharded": false }, "FieldQuery": "select u.col6 from u_tbl6 as u where 1 != 1", - "Query": "select u.col6 from u_tbl6 as u where u.id in ::dml_vals for update", - "Table": "u_tbl6" + "Query": "select u.col6 from u_tbl6 as u where u.id in ::dml_vals for update" }, { "InputName": "CascadeChild-1", @@ -3105,8 +2945,7 @@ "Cols": [ 0 ], - "Query": "delete from u_tbl8 where (col8) in ::fkc_vals", - "Table": "u_tbl8" + "Query": "delete from u_tbl8 where (col8) in ::fkc_vals" }, { "InputName": "Parent", @@ -3116,8 +2955,7 @@ "Name": "unsharded_fk_allow", "Sharded": false }, - "Query": "delete from u_tbl6 as u where u.id in ::dml_vals", - "Table": "u_tbl6" + "Query": "delete from u_tbl6 as u where u.id in ::dml_vals" } ] } @@ -3151,8 +2989,7 @@ "Sharded": false }, "FieldQuery": "select u_tbl10.id from u_tbl10, u_tbl11 where 1 != 1", - "Query": "select u_tbl10.id from u_tbl10, u_tbl11 where u_tbl10.id = 5 and u_tbl10.id = u_tbl11.id for update", - "Table": "u_tbl10, u_tbl11" + "Query": "select u_tbl10.id from u_tbl10, u_tbl11 where u_tbl10.id = 5 and u_tbl10.id = u_tbl11.id for update" }, { "OperatorType": "FkCascade", @@ -3166,8 +3003,7 @@ "Sharded": false }, "FieldQuery": "select u_tbl10.col from u_tbl10 where 1 != 1", - "Query": "select u_tbl10.col from u_tbl10 where u_tbl10.id in ::dml_vals for update", - "Table": "u_tbl10" + "Query": "select u_tbl10.col from u_tbl10 where u_tbl10.id in ::dml_vals for update" }, { "InputName": "CascadeChild-1", @@ -3181,8 +3017,7 @@ "Cols": [ 0 ], - "Query": "delete from u_tbl11 where (col) in ::fkc_vals", - "Table": "u_tbl11" + "Query": "delete from u_tbl11 where (col) in ::fkc_vals" }, { "InputName": "Parent", @@ -3192,8 +3027,7 @@ "Name": "unsharded_fk_allow", "Sharded": false }, - "Query": "delete from u_tbl10 where u_tbl10.id in ::dml_vals", - "Table": "u_tbl10" + "Query": "delete from u_tbl10 where u_tbl10.id in ::dml_vals" } ] } @@ -3226,8 +3060,7 @@ "Sharded": false }, "FieldQuery": "select u_tbl1.id from u_tbl10, u_tbl1 where 1 != 1", - "Query": "select u_tbl1.id from u_tbl10, u_tbl1 where u_tbl10.col = u_tbl1.col for update", - "Table": "u_tbl1, u_tbl10" + "Query": "select u_tbl1.id from u_tbl10, u_tbl1 where u_tbl10.col = u_tbl1.col for update" }, { "OperatorType": "FkCascade", @@ -3241,8 +3074,7 @@ "Sharded": false }, "FieldQuery": "select u_tbl1.col1 from u_tbl1 where 1 != 1", - "Query": "select u_tbl1.col1 from u_tbl1 where u_tbl1.id in ::dml_vals for update", - "Table": "u_tbl1" + "Query": "select u_tbl1.col1 from u_tbl1 where u_tbl1.id in ::dml_vals for update" }, { "InputName": "CascadeChild-1", @@ -3261,8 +3093,7 @@ "Sharded": false }, "FieldQuery": "select u_tbl2.col2 from u_tbl2 where 1 != 1", - "Query": "select u_tbl2.col2 from u_tbl2 where (col2) in ::fkc_vals for update", - "Table": "u_tbl2" + "Query": "select u_tbl2.col2 from u_tbl2 where (col2) in ::fkc_vals for update" }, { "InputName": "CascadeChild-1", @@ -3276,8 +3107,7 @@ "Cols": [ 0 ], - "Query": "update u_tbl3 set col3 = null where (col3) in ::fkc_vals1", - "Table": "u_tbl3" + "Query": "update u_tbl3 set col3 = null where (col3) in ::fkc_vals1" }, { "InputName": "Parent", @@ -3287,8 +3117,7 @@ "Name": "unsharded_fk_allow", "Sharded": false }, - "Query": "delete from u_tbl2 where (col2) in ::fkc_vals", - "Table": "u_tbl2" + "Query": "delete from u_tbl2 where (col2) in ::fkc_vals" } ] }, @@ -3300,8 +3129,7 @@ "Name": "unsharded_fk_allow", "Sharded": false }, - "Query": "delete from u_tbl1 where u_tbl1.id in ::dml_vals", - "Table": "u_tbl1" + "Query": "delete from u_tbl1 where u_tbl1.id in ::dml_vals" } ] } @@ -3336,8 +3164,7 @@ "Sharded": false }, "FieldQuery": "select u_tbl1.id from u_tbl1 where 1 != 1", - "Query": "select u_tbl1.id from u_tbl1 order by id asc limit 1 for update", - "Table": "u_tbl1" + "Query": "select u_tbl1.id from u_tbl1 order by id asc limit 1 for update" }, { "OperatorType": "FkCascade", @@ -3351,8 +3178,7 @@ "Sharded": false }, "FieldQuery": "select u_tbl1.col1 from u_tbl1 where 1 != 1", - "Query": "select u_tbl1.col1 from u_tbl1 where u_tbl1.id in ::dml_vals for update", - "Table": "u_tbl1" + "Query": "select u_tbl1.col1 from u_tbl1 where u_tbl1.id in ::dml_vals for update" }, { "InputName": "CascadeChild-1", @@ -3371,8 +3197,7 @@ "Sharded": false }, "FieldQuery": "select u_tbl2.col2 from u_tbl2 where 1 != 1", - "Query": "select u_tbl2.col2 from u_tbl2 where (col2) in ::fkc_vals for update", - "Table": "u_tbl2" + "Query": "select u_tbl2.col2 from u_tbl2 where (col2) in ::fkc_vals for update" }, { "InputName": "CascadeChild-1", @@ -3386,8 +3211,7 @@ "Cols": [ 0 ], - "Query": "update u_tbl3 set col3 = null where (col3) in ::fkc_vals1", - "Table": "u_tbl3" + "Query": "update u_tbl3 set col3 = null where (col3) in ::fkc_vals1" }, { "InputName": "Parent", @@ -3397,8 +3221,7 @@ "Name": "unsharded_fk_allow", "Sharded": false }, - "Query": "delete from u_tbl2 where (col2) in ::fkc_vals", - "Table": "u_tbl2" + "Query": "delete from u_tbl2 where (col2) in ::fkc_vals" } ] }, @@ -3410,8 +3233,7 @@ "Name": "unsharded_fk_allow", "Sharded": false }, - "Query": "delete from u_tbl1 where u_tbl1.id in ::dml_vals", - "Table": "u_tbl1" + "Query": "delete from u_tbl1 where u_tbl1.id in ::dml_vals" } ] } @@ -3447,8 +3269,7 @@ "Sharded": false }, "FieldQuery": "select col14 from u_tbl1 where 1 != 1", - "Query": "select col14 from u_tbl1 where x = 2 and y = 4 lock in share mode", - "Table": "u_tbl1" + "Query": "select col14 from u_tbl1 where x = 2 and y = 4 lock in share mode" }, { "InputName": "Outer", @@ -3463,8 +3284,7 @@ "Sharded": false }, "FieldQuery": "select 1 from u_tbl4 left join u_tbl1 on u_tbl1.col14 = cast(:__sq1 as SIGNED) where 1 != 1", - "Query": "select 1 from u_tbl4 left join u_tbl1 on u_tbl1.col14 = cast(:__sq1 as SIGNED) where u_tbl1.col14 is null and cast(:__sq1 as SIGNED) is not null and not (u_tbl4.col41) <=> (cast(:__sq1 as SIGNED)) and u_tbl4.col4 = 3 limit 1 for share", - "Table": "u_tbl1, u_tbl4" + "Query": "select 1 from u_tbl4 left join u_tbl1 on u_tbl1.col14 = cast(:__sq1 as SIGNED) where u_tbl1.col14 is null and cast(:__sq1 as SIGNED) is not null and not (u_tbl4.col41) <=> (cast(:__sq1 as SIGNED)) and u_tbl4.col4 = 3 limit 1 for share" }, { "InputName": "PostVerify", @@ -3474,8 +3294,7 @@ "Name": "unsharded_fk_allow", "Sharded": false }, - "Query": "update /*+ SET_VAR(foreign_key_checks=OFF) */ u_tbl4 set col41 = :__sq1 where col4 = 3", - "Table": "u_tbl4" + "Query": "update /*+ SET_VAR(foreign_key_checks=OFF) */ u_tbl4 set col41 = :__sq1 where col4 = 3" } ] } @@ -3510,8 +3329,7 @@ "Sharded": false }, "FieldQuery": "select foo from u_tbl1 where 1 != 1", - "Query": "select foo from u_tbl1 where id = 1 lock in share mode", - "Table": "u_tbl1" + "Query": "select foo from u_tbl1 where id = 1 lock in share mode" }, { "InputName": "Outer", @@ -3526,8 +3344,7 @@ "Sharded": false }, "FieldQuery": "select u_tbl1.col1 from u_tbl1 where 1 != 1", - "Query": "select u_tbl1.col1 from u_tbl1 order by id desc for update", - "Table": "u_tbl1" + "Query": "select u_tbl1.col1 from u_tbl1 order by id desc for update" }, { "InputName": "CascadeChild-1", @@ -3546,8 +3363,7 @@ "Sharded": false }, "FieldQuery": "select u_tbl2.col2 from u_tbl2 where 1 != 1", - "Query": "select u_tbl2.col2 from u_tbl2 where (col2) in ::fkc_vals for update", - "Table": "u_tbl2" + "Query": "select u_tbl2.col2 from u_tbl2 where (col2) in ::fkc_vals for update" }, { "InputName": "CascadeChild-1", @@ -3561,8 +3377,7 @@ "Cols": [ 0 ], - "Query": "update u_tbl3 set col3 = null where (col3) in ::fkc_vals1 and (cast(:__sq1 as CHAR) is null or (col3) not in ((cast(:__sq1 as CHAR))))", - "Table": "u_tbl3" + "Query": "update u_tbl3 set col3 = null where (col3) in ::fkc_vals1 and (cast(:__sq1 as CHAR) is null or (col3) not in ((cast(:__sq1 as CHAR))))" }, { "InputName": "Parent", @@ -3572,8 +3387,7 @@ "Name": "unsharded_fk_allow", "Sharded": false }, - "Query": "update /*+ SET_VAR(foreign_key_checks=OFF) */ u_tbl2 set col2 = :__sq1 where (col2) in ::fkc_vals", - "Table": "u_tbl2" + "Query": "update /*+ SET_VAR(foreign_key_checks=OFF) */ u_tbl2 set col2 = :__sq1 where (col2) in ::fkc_vals" } ] }, @@ -3594,8 +3408,7 @@ "Sharded": false }, "FieldQuery": "select u_tbl9.col9 from u_tbl9 where 1 != 1", - "Query": "select u_tbl9.col9 from u_tbl9 where (col9) in ::fkc_vals2 and (cast(:__sq1 as CHAR) is null or (col9) not in ((cast(:__sq1 as CHAR)))) for update nowait", - "Table": "u_tbl9" + "Query": "select u_tbl9.col9 from u_tbl9 where (col9) in ::fkc_vals2 and (cast(:__sq1 as CHAR) is null or (col9) not in ((cast(:__sq1 as CHAR)))) for update nowait" }, { "InputName": "CascadeChild-1", @@ -3609,8 +3422,7 @@ "Cols": [ 0 ], - "Query": "update u_tbl8 set col8 = null where (col8) in ::fkc_vals3", - "Table": "u_tbl8" + "Query": "update u_tbl8 set col8 = null where (col8) in ::fkc_vals3" }, { "InputName": "Parent", @@ -3620,8 +3432,7 @@ "Name": "unsharded_fk_allow", "Sharded": false }, - "Query": "update u_tbl9 set col9 = null where (col9) in ::fkc_vals2 and (cast(:__sq1 as CHAR) is null or (col9) not in ((cast(:__sq1 as CHAR))))", - "Table": "u_tbl9" + "Query": "update u_tbl9 set col9 = null where (col9) in ::fkc_vals2 and (cast(:__sq1 as CHAR) is null or (col9) not in ((cast(:__sq1 as CHAR))))" } ] }, @@ -3633,8 +3444,7 @@ "Name": "unsharded_fk_allow", "Sharded": false }, - "Query": "update /*+ SET_VAR(foreign_key_checks=OFF) */ u_tbl1 set col1 = :__sq1 order by id desc", - "Table": "u_tbl1" + "Query": "update /*+ SET_VAR(foreign_key_checks=OFF) */ u_tbl1 set col1 = :__sq1 order by id desc" } ] } @@ -3670,8 +3480,7 @@ "Sharded": false }, "FieldQuery": "select u_tbl6.id from u_tbl6, u_tbl8 where 1 != 1", - "Query": "select u_tbl6.id from u_tbl6, u_tbl8 where u_tbl6.id = 4 and u_tbl6.id = u_tbl8.id for update", - "Table": "u_tbl6, u_tbl8" + "Query": "select u_tbl6.id from u_tbl6, u_tbl8 where u_tbl6.id = 4 and u_tbl6.id = u_tbl8.id for update" }, { "OperatorType": "FkCascade", @@ -3685,8 +3494,7 @@ "Sharded": false }, "FieldQuery": "select u_tbl6.col6 from u_tbl6 where 1 != 1", - "Query": "select u_tbl6.col6 from u_tbl6 where u_tbl6.id in ::dml_vals for update", - "Table": "u_tbl6" + "Query": "select u_tbl6.col6 from u_tbl6 where u_tbl6.id in ::dml_vals for update" }, { "InputName": "CascadeChild-1", @@ -3700,8 +3508,7 @@ "Cols": [ 0 ], - "Query": "delete from u_tbl8 where (col8) in ::fkc_vals", - "Table": "u_tbl8" + "Query": "delete from u_tbl8 where (col8) in ::fkc_vals" }, { "InputName": "Parent", @@ -3711,8 +3518,7 @@ "Name": "unsharded_fk_allow", "Sharded": false }, - "Query": "delete from u_tbl6 where u_tbl6.id in ::dml_vals", - "Table": "u_tbl6" + "Query": "delete from u_tbl6 where u_tbl6.id in ::dml_vals" } ] } @@ -3746,8 +3552,7 @@ "Sharded": false }, "FieldQuery": "select u.id, m.id from u_tbl6 as u, u_tbl5 as m where 1 != 1", - "Query": "select u.id, m.id from u_tbl6 as u, u_tbl5 as m where u.col2 = 4 and m.col3 = 6 and u.col = m.col for update", - "Table": "u_tbl5, u_tbl6" + "Query": "select u.id, m.id from u_tbl6 as u, u_tbl5 as m where u.col2 = 4 and m.col3 = 6 and u.col = m.col for update" }, { "OperatorType": "FkCascade", @@ -3761,8 +3566,7 @@ "Sharded": false }, "FieldQuery": "select u.col6 from u_tbl6 as u where 1 != 1", - "Query": "select u.col6 from u_tbl6 as u where u.id in ::dml_vals for update", - "Table": "u_tbl6" + "Query": "select u.col6 from u_tbl6 as u where u.id in ::dml_vals for update" }, { "InputName": "CascadeChild-1", @@ -3776,8 +3580,7 @@ "Cols": [ 0 ], - "Query": "delete from u_tbl8 where (col8) in ::fkc_vals", - "Table": "u_tbl8" + "Query": "delete from u_tbl8 where (col8) in ::fkc_vals" }, { "InputName": "Parent", @@ -3787,8 +3590,7 @@ "Name": "unsharded_fk_allow", "Sharded": false }, - "Query": "delete from u_tbl6 as u where u.id in ::dml_vals", - "Table": "u_tbl6" + "Query": "delete from u_tbl6 as u where u.id in ::dml_vals" } ] }, @@ -3799,8 +3601,7 @@ "Name": "unsharded_fk_allow", "Sharded": false }, - "Query": "delete from u_tbl5 as m where m.id in ::dml_vals", - "Table": "u_tbl5" + "Query": "delete from u_tbl5 as m where m.id in ::dml_vals" } ] }, @@ -3832,8 +3633,7 @@ "Sharded": false }, "FieldQuery": "select u_tbl2.id from u_tbl2 where 1 != 1", - "Query": "select u_tbl2.id from u_tbl2 limit 2 for update", - "Table": "u_tbl2" + "Query": "select u_tbl2.id from u_tbl2 limit 2 for update" }, { "OperatorType": "FkCascade", @@ -3847,8 +3647,7 @@ "Sharded": false }, "FieldQuery": "select u_tbl2.col2 from u_tbl2 where 1 != 1", - "Query": "select u_tbl2.col2 from u_tbl2 where u_tbl2.id in ::dml_vals for update", - "Table": "u_tbl2" + "Query": "select u_tbl2.col2 from u_tbl2 where u_tbl2.id in ::dml_vals for update" }, { "InputName": "CascadeChild-1", @@ -3862,8 +3661,7 @@ "Cols": [ 0 ], - "Query": "update u_tbl3 set col3 = null where (col3) in ::fkc_vals and (col3) not in ((cast('bar' as CHAR)))", - "Table": "u_tbl3" + "Query": "update u_tbl3 set col3 = null where (col3) in ::fkc_vals and (col3) not in ((cast('bar' as CHAR)))" }, { "InputName": "Parent", @@ -3873,8 +3671,7 @@ "Name": "unsharded_fk_allow", "Sharded": false }, - "Query": "update u_tbl2 set col2 = 'bar' where u_tbl2.id in ::dml_vals", - "Table": "u_tbl2" + "Query": "update u_tbl2 set col2 = 'bar' where u_tbl2.id in ::dml_vals" } ] } @@ -3907,8 +3704,7 @@ "Sharded": false }, "FieldQuery": "select u_tbl2.id from u_tbl2 where 1 != 1", - "Query": "select u_tbl2.id from u_tbl2 order by id asc limit 2 for update", - "Table": "u_tbl2" + "Query": "select u_tbl2.id from u_tbl2 order by id asc limit 2 for update" }, { "OperatorType": "FKVerify", @@ -3922,8 +3718,7 @@ "Sharded": false }, "FieldQuery": "select 1 from u_tbl2 left join u_tbl1 on u_tbl1.col1 = cast(u_tbl2.id + 1 as CHAR) where 1 != 1", - "Query": "select 1 from u_tbl2 left join u_tbl1 on u_tbl1.col1 = cast(u_tbl2.id + 1 as CHAR) where u_tbl1.col1 is null and cast(u_tbl2.id + 1 as CHAR) is not null and not (u_tbl2.col2) <=> (cast(u_tbl2.id + 1 as CHAR)) and u_tbl2.id in ::dml_vals limit 1 for share", - "Table": "u_tbl1, u_tbl2" + "Query": "select 1 from u_tbl2 left join u_tbl1 on u_tbl1.col1 = cast(u_tbl2.id + 1 as CHAR) where u_tbl1.col1 is null and cast(u_tbl2.id + 1 as CHAR) is not null and not (u_tbl2.col2) <=> (cast(u_tbl2.id + 1 as CHAR)) and u_tbl2.id in ::dml_vals limit 1 for share" }, { "InputName": "PostVerify", @@ -3938,8 +3733,7 @@ "Sharded": false }, "FieldQuery": "select u_tbl2.col2, col2 <=> cast(id + 1 as CHAR), cast(id + 1 as CHAR) from u_tbl2 where 1 != 1", - "Query": "select u_tbl2.col2, col2 <=> cast(id + 1 as CHAR), cast(id + 1 as CHAR) from u_tbl2 where u_tbl2.id in ::dml_vals order by id asc for update", - "Table": "u_tbl2" + "Query": "select u_tbl2.col2, col2 <=> cast(id + 1 as CHAR), cast(id + 1 as CHAR) from u_tbl2 where u_tbl2.id in ::dml_vals order by id asc for update" }, { "InputName": "CascadeChild-1", @@ -3960,8 +3754,7 @@ "UpdateExprBvName": "fkc_upd" } ], - "Query": "update u_tbl3 set col3 = null where (col3) in ::fkc_vals and (:fkc_upd is null or (col3) not in ((:fkc_upd)))", - "Table": "u_tbl3" + "Query": "update u_tbl3 set col3 = null where (col3) in ::fkc_vals and (:fkc_upd is null or (col3) not in ((:fkc_upd)))" }, { "InputName": "Parent", @@ -3971,8 +3764,7 @@ "Name": "unsharded_fk_allow", "Sharded": false }, - "Query": "update /*+ SET_VAR(foreign_key_checks=OFF) */ u_tbl2 set col2 = id + 1 where u_tbl2.id in ::dml_vals order by id asc", - "Table": "u_tbl2" + "Query": "update /*+ SET_VAR(foreign_key_checks=OFF) */ u_tbl2 set col2 = id + 1 where u_tbl2.id in ::dml_vals order by id asc" } ] } @@ -4006,8 +3798,7 @@ "Sharded": false }, "FieldQuery": "select u.col6 from u_tbl6 as u, u_tbl5 as m where 1 != 1", - "Query": "select u.col6 from u_tbl6 as u, u_tbl5 as m where u.col = m.col and u.col2 = 4 and m.col3 = 6 for update", - "Table": "u_tbl5, u_tbl6" + "Query": "select u.col6 from u_tbl6 as u, u_tbl5 as m where u.col = m.col and u.col2 = 4 and m.col3 = 6 for update" }, { "InputName": "CascadeChild-1", @@ -4026,8 +3817,7 @@ "Sharded": false }, "FieldQuery": "select 1 from u_tbl8 left join u_tbl9 on u_tbl9.col9 = cast('foo' as CHAR) where 1 != 1", - "Query": "select 1 from u_tbl8 left join u_tbl9 on u_tbl9.col9 = cast('foo' as CHAR) where u_tbl9.col9 is null and not (u_tbl8.col8) <=> (cast('foo' as CHAR)) and (u_tbl8.col8) in ::fkc_vals limit 1 for share nowait", - "Table": "u_tbl8, u_tbl9" + "Query": "select 1 from u_tbl8 left join u_tbl9 on u_tbl9.col9 = cast('foo' as CHAR) where u_tbl9.col9 is null and not (u_tbl8.col8) <=> (cast('foo' as CHAR)) and (u_tbl8.col8) in ::fkc_vals limit 1 for share nowait" }, { "InputName": "PostVerify", @@ -4037,8 +3827,7 @@ "Name": "unsharded_fk_allow", "Sharded": false }, - "Query": "update /*+ SET_VAR(foreign_key_checks=OFF) */ u_tbl8 set col8 = 'foo' where (col8) in ::fkc_vals", - "Table": "u_tbl8" + "Query": "update /*+ SET_VAR(foreign_key_checks=OFF) */ u_tbl8 set col8 = 'foo' where (col8) in ::fkc_vals" } ] }, @@ -4050,8 +3839,7 @@ "Name": "unsharded_fk_allow", "Sharded": false }, - "Query": "update u_tbl6 as u, u_tbl5 as m set u.col6 = 'foo' where u.col2 = 4 and m.col3 = 6 and u.col = m.col", - "Table": "u_tbl6" + "Query": "update u_tbl6 as u, u_tbl5 as m set u.col6 = 'foo' where u.col2 = 4 and m.col3 = 6 and u.col = m.col" } ] }, @@ -4085,8 +3873,7 @@ "Sharded": false }, "FieldQuery": "select u.id, m.id from u_tbl1 as u, u_multicol_tbl1 as m where 1 != 1", - "Query": "select u.id, m.id from u_tbl1 as u, u_multicol_tbl1 as m where u.foo = 4 and m.bar = 6 and u.col = m.col for update", - "Table": "u_multicol_tbl1, u_tbl1" + "Query": "select u.id, m.id from u_tbl1 as u, u_multicol_tbl1 as m where u.foo = 4 and m.bar = 6 and u.col = m.col for update" }, { "OperatorType": "FkCascade", @@ -4100,8 +3887,7 @@ "Sharded": false }, "FieldQuery": "select u.col1 from u_tbl1 as u where 1 != 1", - "Query": "select u.col1 from u_tbl1 as u where u.id in ::dml_vals for update", - "Table": "u_tbl1" + "Query": "select u.col1 from u_tbl1 as u where u.id in ::dml_vals for update" }, { "InputName": "CascadeChild-1", @@ -4120,8 +3906,7 @@ "Sharded": false }, "FieldQuery": "select u_tbl2.col2 from u_tbl2 where 1 != 1", - "Query": "select u_tbl2.col2 from u_tbl2 where (col2) in ::fkc_vals for update", - "Table": "u_tbl2" + "Query": "select u_tbl2.col2 from u_tbl2 where (col2) in ::fkc_vals for update" }, { "InputName": "CascadeChild-1", @@ -4135,8 +3920,7 @@ "Cols": [ 0 ], - "Query": "update u_tbl3 set col3 = null where (col3) in ::fkc_vals1 and (col3) not in ((cast('foo' as CHAR)))", - "Table": "u_tbl3" + "Query": "update u_tbl3 set col3 = null where (col3) in ::fkc_vals1 and (col3) not in ((cast('foo' as CHAR)))" }, { "InputName": "Parent", @@ -4146,8 +3930,7 @@ "Name": "unsharded_fk_allow", "Sharded": false }, - "Query": "update /*+ SET_VAR(foreign_key_checks=OFF) */ u_tbl2 set col2 = 'foo' where (col2) in ::fkc_vals", - "Table": "u_tbl2" + "Query": "update /*+ SET_VAR(foreign_key_checks=OFF) */ u_tbl2 set col2 = 'foo' where (col2) in ::fkc_vals" } ] }, @@ -4168,8 +3951,7 @@ "Sharded": false }, "FieldQuery": "select u_tbl9.col9 from u_tbl9 where 1 != 1", - "Query": "select u_tbl9.col9 from u_tbl9 where (col9) in ::fkc_vals2 and (col9) not in ((cast('foo' as CHAR))) for update nowait", - "Table": "u_tbl9" + "Query": "select u_tbl9.col9 from u_tbl9 where (col9) in ::fkc_vals2 and (col9) not in ((cast('foo' as CHAR))) for update nowait" }, { "InputName": "CascadeChild-1", @@ -4183,8 +3965,7 @@ "Cols": [ 0 ], - "Query": "update u_tbl8 set col8 = null where (col8) in ::fkc_vals3", - "Table": "u_tbl8" + "Query": "update u_tbl8 set col8 = null where (col8) in ::fkc_vals3" }, { "InputName": "Parent", @@ -4194,8 +3975,7 @@ "Name": "unsharded_fk_allow", "Sharded": false }, - "Query": "update u_tbl9 set col9 = null where (col9) in ::fkc_vals2 and (col9) not in ((cast('foo' as CHAR)))", - "Table": "u_tbl9" + "Query": "update u_tbl9 set col9 = null where (col9) in ::fkc_vals2 and (col9) not in ((cast('foo' as CHAR)))" } ] }, @@ -4207,8 +3987,7 @@ "Name": "unsharded_fk_allow", "Sharded": false }, - "Query": "update u_tbl1 as u set u.col1 = 'foo' where u.id in ::dml_vals", - "Table": "u_tbl1" + "Query": "update u_tbl1 as u set u.col1 = 'foo' where u.id in ::dml_vals" } ] }, @@ -4224,8 +4003,7 @@ "Sharded": false }, "FieldQuery": "select m.cola, m.colb from u_multicol_tbl1 as m where 1 != 1", - "Query": "select m.cola, m.colb from u_multicol_tbl1 as m where m.id in ::dml_vals for update", - "Table": "u_multicol_tbl1" + "Query": "select m.cola, m.colb from u_multicol_tbl1 as m where m.id in ::dml_vals for update" }, { "InputName": "CascadeChild-1", @@ -4245,8 +4023,7 @@ "Sharded": false }, "FieldQuery": "select u_multicol_tbl2.cola, u_multicol_tbl2.colb from u_multicol_tbl2 where 1 != 1", - "Query": "select u_multicol_tbl2.cola, u_multicol_tbl2.colb from u_multicol_tbl2 where (cola, colb) in ::fkc_vals4 and (cola) not in (('bar')) for update", - "Table": "u_multicol_tbl2" + "Query": "select u_multicol_tbl2.cola, u_multicol_tbl2.colb from u_multicol_tbl2 where (cola, colb) in ::fkc_vals4 and (cola) not in (('bar')) for update" }, { "InputName": "CascadeChild-1", @@ -4261,8 +4038,7 @@ 0, 1 ], - "Query": "update /*+ SET_VAR(foreign_key_checks=OFF) */ u_multicol_tbl3 set cola = null, colb = null where (cola, colb) in ::fkc_vals5", - "Table": "u_multicol_tbl3" + "Query": "update /*+ SET_VAR(foreign_key_checks=OFF) */ u_multicol_tbl3 set cola = null, colb = null where (cola, colb) in ::fkc_vals5" }, { "InputName": "Parent", @@ -4272,8 +4048,7 @@ "Name": "unsharded_fk_allow", "Sharded": false }, - "Query": "update u_multicol_tbl2 set cola = null, colb = null where (cola, colb) in ::fkc_vals4 and (cola) not in (('bar'))", - "Table": "u_multicol_tbl2" + "Query": "update u_multicol_tbl2 set cola = null, colb = null where (cola, colb) in ::fkc_vals4 and (cola) not in (('bar'))" } ] }, @@ -4285,8 +4060,7 @@ "Name": "unsharded_fk_allow", "Sharded": false }, - "Query": "update u_multicol_tbl1 as m set m.cola = 'bar' where m.id in ::dml_vals", - "Table": "u_multicol_tbl1" + "Query": "update u_multicol_tbl1 as m set m.cola = 'bar' where m.id in ::dml_vals" } ] } diff --git a/go/vt/vtgate/planbuilder/testdata/foreignkey_checks_off_cases.json b/go/vt/vtgate/planbuilder/testdata/foreignkey_checks_off_cases.json index 3a5105224d2..08c8377c611 100644 --- a/go/vt/vtgate/planbuilder/testdata/foreignkey_checks_off_cases.json +++ b/go/vt/vtgate/planbuilder/testdata/foreignkey_checks_off_cases.json @@ -14,7 +14,6 @@ "Sharded": true }, "Query": "insert /*+ SET_VAR(foreign_key_checks=Off) */ into tbl3(col3, coly) values (:_col3_0, 3)", - "TableName": "tbl3", "VindexValues": { "hash_vin": "1" } @@ -39,7 +38,6 @@ "Sharded": true }, "Query": "insert /*+ SET_VAR(foreign_key_checks=Off) */ into multicol_tbl2(cola, colb, colc) values (:_cola_0, :_colb_0, :_colc_0)", - "TableName": "multicol_tbl2", "VindexValues": { "multicolIdx": "1, 2, 3" } @@ -63,8 +61,7 @@ "Name": "sharded_fk_allow", "Sharded": true }, - "Query": "delete /*+ SET_VAR(foreign_key_checks=Off) */ from tbl1", - "Table": "tbl1" + "Query": "delete /*+ SET_VAR(foreign_key_checks=Off) */ from tbl1" }, "TablesUsed": [ "sharded_fk_allow.tbl1" @@ -85,8 +82,7 @@ "Name": "sharded_fk_allow", "Sharded": true }, - "Query": "delete /*+ SET_VAR(foreign_key_checks=Off) */ from tbl7", - "Table": "tbl7" + "Query": "delete /*+ SET_VAR(foreign_key_checks=Off) */ from tbl7" }, "TablesUsed": [ "sharded_fk_allow.tbl7" @@ -113,7 +109,6 @@ }, "FieldQuery": "select multicol_tbl1.colb, multicol_tbl1.cola, multicol_tbl1.y, multicol_tbl1.colc, multicol_tbl1.x from multicol_tbl1 where 1 != 1", "Query": "select multicol_tbl1.colb, multicol_tbl1.cola, multicol_tbl1.y, multicol_tbl1.colc, multicol_tbl1.x from multicol_tbl1 where cola = 1 and colb = 2 and colc = 3 for update", - "Table": "multicol_tbl1", "Values": [ "1", "2", @@ -138,7 +133,6 @@ 4 ], "Query": "delete /*+ SET_VAR(foreign_key_checks=ON) */ from multicol_tbl2 where (colb, cola, x, colc, y) in ::fkc_vals", - "Table": "multicol_tbl2", "Values": [ "fkc_vals:1", "fkc_vals:0", @@ -155,7 +149,6 @@ "Sharded": true }, "Query": "delete /*+ SET_VAR(foreign_key_checks=On) */ from multicol_tbl1 where cola = 1 and colb = 2 and colc = 3", - "Table": "multicol_tbl1", "Values": [ "1", "2", @@ -186,7 +179,6 @@ "Sharded": true }, "Query": "delete /*+ SET_VAR(foreign_key_checks=Off) */ from tbl8 where col8 = 1", - "Table": "tbl8", "Values": [ "1" ], @@ -212,7 +204,6 @@ "Sharded": true }, "Query": "update /*+ SET_VAR(foreign_key_checks=Off) */ tbl1 set t1col1 = 'foo' where col1 = 1", - "Table": "tbl1", "Values": [ "1" ], @@ -237,8 +228,7 @@ "Name": "sharded_fk_allow", "Sharded": true }, - "Query": "update /*+ SET_VAR(foreign_key_checks=Off) */ tbl7 set t7col7 = 'foo', t7col72 = 42", - "Table": "tbl7" + "Query": "update /*+ SET_VAR(foreign_key_checks=Off) */ tbl7 set t7col7 = 'foo', t7col72 = 42" }, "TablesUsed": [ "sharded_fk_allow.tbl7" @@ -264,8 +254,7 @@ "Sharded": true }, "FieldQuery": "select tbl5.t5col5 from tbl5 where 1 != 1", - "Query": "select tbl5.t5col5 from tbl5 for update", - "Table": "tbl5" + "Query": "select tbl5.t5col5 from tbl5 for update" }, { "InputName": "CascadeChild-1", @@ -279,8 +268,7 @@ "Cols": [ 0 ], - "Query": "update /*+ SET_VAR(foreign_key_checks=ON) */ tbl4 set t4col4 = null where (t4col4) in ::fkc_vals and (t4col4) not in (('foo'))", - "Table": "tbl4" + "Query": "update /*+ SET_VAR(foreign_key_checks=ON) */ tbl4 set t4col4 = null where (t4col4) in ::fkc_vals and (t4col4) not in (('foo'))" }, { "InputName": "Parent", @@ -290,8 +278,7 @@ "Name": "sharded_fk_allow", "Sharded": true }, - "Query": "update /*+ SET_VAR(foreign_key_checks=On) */ tbl5 set t5col5 = 'foo'", - "Table": "tbl5" + "Query": "update /*+ SET_VAR(foreign_key_checks=On) */ tbl5 set t5col5 = 'foo'" } ] }, @@ -316,7 +303,6 @@ "Sharded": true }, "Query": "insert /*+ SET_VAR(foreign_key_checks=Off) */ into tbl6(col6, t6col6) values (:_col6_0, 'foo')", - "TableName": "tbl6", "VindexValues": { "hash_vin": "100" } @@ -341,7 +327,6 @@ "Sharded": true }, "Query": "delete /*+ SET_VAR(foreign_key_checks=Off) */ from tbl20 where col = 'bar'", - "Table": "tbl20", "Values": [ "'bar'" ], @@ -372,7 +357,6 @@ }, "FieldQuery": "select tbl9.col9 from tbl9 where 1 != 1", "Query": "select tbl9.col9 from tbl9 where col9 = 34 for update", - "Table": "tbl9", "Values": [ "34" ], @@ -390,8 +374,7 @@ "Cols": [ 0 ], - "Query": "update /*+ SET_VAR(foreign_key_checks=ON) */ tbl4 set col_ref = null where (col_ref) in ::fkc_vals", - "Table": "tbl4" + "Query": "update /*+ SET_VAR(foreign_key_checks=ON) */ tbl4 set col_ref = null where (col_ref) in ::fkc_vals" }, { "InputName": "Parent", @@ -402,7 +385,6 @@ "Sharded": true }, "Query": "delete /*+ SET_VAR(foreign_key_checks=On) */ from tbl9 where col9 = 34", - "Table": "tbl9", "Values": [ "34" ], @@ -431,7 +413,6 @@ "Sharded": true }, "Query": "delete /*+ SET_VAR(foreign_key_checks=Off) */ from multicol_tbl1 where cola = 1 and colb = 2 and colc = 3", - "Table": "multicol_tbl1", "Values": [ "1", "2", @@ -458,8 +439,7 @@ "Name": "unsharded_fk_allow", "Sharded": false }, - "Query": "update /*+ SET_VAR(foreign_key_checks=Off) */ u_multicol_tbl1 set cola = 1, colb = 2 where id = 3", - "Table": "u_multicol_tbl1" + "Query": "update /*+ SET_VAR(foreign_key_checks=Off) */ u_multicol_tbl1 set cola = 1, colb = 2 where id = 3" }, "TablesUsed": [ "unsharded_fk_allow.u_multicol_tbl1" @@ -481,7 +461,6 @@ "Sharded": true }, "Query": "insert /*+ SET_VAR(foreign_key_checks=Off) */ into tbl3(col3, coly) values (:_col3_0, 3)", - "TableName": "tbl3", "VindexValues": { "hash_vin": "1" } diff --git a/go/vt/vtgate/planbuilder/testdata/foreignkey_checks_on_cases.json b/go/vt/vtgate/planbuilder/testdata/foreignkey_checks_on_cases.json index 9d9de507022..0de693196cd 100644 --- a/go/vt/vtgate/planbuilder/testdata/foreignkey_checks_on_cases.json +++ b/go/vt/vtgate/planbuilder/testdata/foreignkey_checks_on_cases.json @@ -19,7 +19,6 @@ "Sharded": true }, "Query": "insert /*+ SET_VAR(foreign_key_checks=On) */ into tbl2(col2, coly) values (:_col2_0, 3)", - "TableName": "tbl2", "VindexValues": { "hash_vin": "1" } @@ -44,7 +43,6 @@ "Sharded": true }, "Query": "insert /*+ SET_VAR(foreign_key_checks=On) */ into multicol_tbl2(cola, colb, colc) values (:_cola_0, :_colb_0, :_colc_0)", - "TableName": "multicol_tbl2", "VindexValues": { "multicolIdx": "1, 2, 3" } @@ -84,7 +82,6 @@ }, "FieldQuery": "select multicol_tbl1.colb, multicol_tbl1.cola, multicol_tbl1.y, multicol_tbl1.colc, multicol_tbl1.x from multicol_tbl1 where 1 != 1", "Query": "select multicol_tbl1.colb, multicol_tbl1.cola, multicol_tbl1.y, multicol_tbl1.colc, multicol_tbl1.x from multicol_tbl1 where cola = 1 and colb = 2 and colc = 3 for update", - "Table": "multicol_tbl1", "Values": [ "1", "2", @@ -109,7 +106,6 @@ 4 ], "Query": "delete /*+ SET_VAR(foreign_key_checks=ON) */ from multicol_tbl2 where (colb, cola, x, colc, y) in ::fkc_vals", - "Table": "multicol_tbl2", "Values": [ "fkc_vals:1", "fkc_vals:0", @@ -126,7 +122,6 @@ "Sharded": true }, "Query": "delete /*+ SET_VAR(foreign_key_checks=On) */ from multicol_tbl1 where cola = 1 and colb = 2 and colc = 3", - "Table": "multicol_tbl1", "Values": [ "1", "2", @@ -161,8 +156,7 @@ "Sharded": true }, "FieldQuery": "select tbl5.col5, tbl5.t5col5 from tbl5 where 1 != 1", - "Query": "select tbl5.col5, tbl5.t5col5 from tbl5 for update", - "Table": "tbl5" + "Query": "select tbl5.col5, tbl5.t5col5 from tbl5 for update" }, { "InputName": "CascadeChild-1", @@ -177,7 +171,6 @@ 0 ], "Query": "delete /*+ SET_VAR(foreign_key_checks=ON) */ from tbl4 where (col4) in ::fkc_vals", - "Table": "tbl4", "Values": [ "fkc_vals:0" ], @@ -195,8 +188,7 @@ "Cols": [ 1 ], - "Query": "delete /*+ SET_VAR(foreign_key_checks=ON) */ from tbl4 where (t4col4) in ::fkc_vals1", - "Table": "tbl4" + "Query": "delete /*+ SET_VAR(foreign_key_checks=ON) */ from tbl4 where (t4col4) in ::fkc_vals1" }, { "InputName": "Parent", @@ -206,8 +198,7 @@ "Name": "sharded_fk_allow", "Sharded": true }, - "Query": "delete /*+ SET_VAR(foreign_key_checks=On) */ from tbl5", - "Table": "tbl5" + "Query": "delete /*+ SET_VAR(foreign_key_checks=On) */ from tbl5" } ] }, @@ -241,8 +232,7 @@ "Sharded": false }, "FieldQuery": "select u_tbl9.col9 from u_tbl9 where 1 != 1", - "Query": "select u_tbl9.col9 from u_tbl9 where col9 = 5 for update nowait", - "Table": "u_tbl9" + "Query": "select u_tbl9.col9 from u_tbl9 where col9 = 5 for update nowait" }, { "InputName": "CascadeChild-1", @@ -256,8 +246,7 @@ "Cols": [ 0 ], - "Query": "update /*+ SET_VAR(foreign_key_checks=ON) */ u_tbl8 set col8 = null where (col8) in ::fkc_vals", - "Table": "u_tbl8" + "Query": "update /*+ SET_VAR(foreign_key_checks=ON) */ u_tbl8 set col8 = null where (col8) in ::fkc_vals" }, { "InputName": "Parent", @@ -267,8 +256,7 @@ "Name": "unsharded_fk_allow", "Sharded": false }, - "Query": "delete /*+ SET_VAR(foreign_key_checks=On) */ from u_tbl9 where col9 = 5", - "Table": "u_tbl9" + "Query": "delete /*+ SET_VAR(foreign_key_checks=On) */ from u_tbl9 where col9 = 5" } ] }, @@ -292,8 +280,7 @@ "Name": "unsharded_fk_allow", "Sharded": false }, - "Query": "update /*+ SET_VAR(foreign_key_checks=On) */ u_tbl5 set col5 = 'foo' where id = 1", - "Table": "u_tbl5" + "Query": "update /*+ SET_VAR(foreign_key_checks=On) */ u_tbl5 set col5 = 'foo' where id = 1" }, "TablesUsed": [ "unsharded_fk_allow.u_tbl5" @@ -319,8 +306,7 @@ "Sharded": false }, "FieldQuery": "select u_tbl2.col2 from u_tbl2 where 1 != 1", - "Query": "select u_tbl2.col2 from u_tbl2 where id = 1 for update", - "Table": "u_tbl2" + "Query": "select u_tbl2.col2 from u_tbl2 where id = 1 for update" }, { "InputName": "CascadeChild-1", @@ -334,8 +320,7 @@ "Cols": [ 0 ], - "Query": "update /*+ SET_VAR(foreign_key_checks=ON) */ u_tbl3 set col3 = null where (col3) in ::fkc_vals and (col3) not in ((cast('bar' as CHAR)))", - "Table": "u_tbl3" + "Query": "update /*+ SET_VAR(foreign_key_checks=ON) */ u_tbl3 set col3 = null where (col3) in ::fkc_vals and (col3) not in ((cast('bar' as CHAR)))" }, { "InputName": "Parent", @@ -345,8 +330,7 @@ "Name": "unsharded_fk_allow", "Sharded": false }, - "Query": "update /*+ SET_VAR(foreign_key_checks=On) */ u_tbl2 set col2 = 'bar' where id = 1", - "Table": "u_tbl2" + "Query": "update /*+ SET_VAR(foreign_key_checks=On) */ u_tbl2 set col2 = 'bar' where id = 1" } ] }, @@ -370,8 +354,7 @@ "Name": "unsharded_fk_allow", "Sharded": false }, - "Query": "update /*+ SET_VAR(foreign_key_checks=On) */ u_tbl2 set col_no_ref = 'baz' where id = 1", - "Table": "u_tbl2" + "Query": "update /*+ SET_VAR(foreign_key_checks=On) */ u_tbl2 set col_no_ref = 'baz' where id = 1" }, "TablesUsed": [ "unsharded_fk_allow.u_tbl2" @@ -397,8 +380,7 @@ "Name": "sharded_fk_allow", "Sharded": true }, - "Query": "update /*+ SET_VAR(foreign_key_checks=On) */ tbl1 set not_ref_col = 'foo' where id = 1", - "Table": "tbl1" + "Query": "update /*+ SET_VAR(foreign_key_checks=On) */ tbl1 set not_ref_col = 'foo' where id = 1" }, "TablesUsed": [ "sharded_fk_allow.tbl1" @@ -429,8 +411,7 @@ "Sharded": true }, "FieldQuery": "select tbl5.t5col5 from tbl5 where 1 != 1", - "Query": "select tbl5.t5col5 from tbl5 for update", - "Table": "tbl5" + "Query": "select tbl5.t5col5 from tbl5 for update" }, { "InputName": "CascadeChild-1", @@ -444,8 +425,7 @@ "Cols": [ 0 ], - "Query": "update /*+ SET_VAR(foreign_key_checks=ON) */ tbl4 set t4col4 = null where (t4col4) in ::fkc_vals and (t4col4) not in (('foo'))", - "Table": "tbl4" + "Query": "update /*+ SET_VAR(foreign_key_checks=ON) */ tbl4 set t4col4 = null where (t4col4) in ::fkc_vals and (t4col4) not in (('foo'))" }, { "InputName": "Parent", @@ -455,8 +435,7 @@ "Name": "sharded_fk_allow", "Sharded": true }, - "Query": "update /*+ SET_VAR(foreign_key_checks=On) */ tbl5 set t5col5 = 'foo'", - "Table": "tbl5" + "Query": "update /*+ SET_VAR(foreign_key_checks=On) */ tbl5 set t5col5 = 'foo'" } ] }, @@ -485,8 +464,7 @@ "Name": "sharded_fk_allow", "Sharded": true }, - "Query": "update /*+ SET_VAR(foreign_key_checks=On) */ tbl2 set col = 'foo'", - "Table": "tbl2" + "Query": "update /*+ SET_VAR(foreign_key_checks=On) */ tbl2 set col = 'foo'" }, "TablesUsed": [ "sharded_fk_allow.tbl2" @@ -522,7 +500,6 @@ "OperatorType": "Join", "Variant": "LeftJoin", "JoinColumnIndexes": "R:0", - "TableName": "tbl10_tbl3", "Inputs": [ { "OperatorType": "Route", @@ -532,8 +509,7 @@ "Sharded": true }, "FieldQuery": "select 1 from tbl10 where 1 != 1", - "Query": "select 1 from tbl10 where not (tbl10.col) <=> ('foo') for share", - "Table": "tbl10" + "Query": "select 1 from tbl10 where not (tbl10.col) <=> ('foo') for share" }, { "OperatorType": "Route", @@ -543,8 +519,7 @@ "Sharded": true }, "FieldQuery": "select tbl3.col from tbl3 where 1 != 1", - "Query": "select tbl3.col from tbl3 where tbl3.col = 'foo' for share", - "Table": "tbl3" + "Query": "select tbl3.col from tbl3 where tbl3.col = 'foo' for share" } ] } @@ -562,8 +537,7 @@ "Name": "sharded_fk_allow", "Sharded": true }, - "Query": "update /*+ SET_VAR(foreign_key_checks=On) */ tbl10 set col = 'foo'", - "Table": "tbl10" + "Query": "update /*+ SET_VAR(foreign_key_checks=On) */ tbl10 set col = 'foo'" } ] }, @@ -598,7 +572,6 @@ }, "FieldQuery": "select tbl9.col9 from tbl9 where 1 != 1", "Query": "select tbl9.col9 from tbl9 where col9 = 34 for update", - "Table": "tbl9", "Values": [ "34" ], @@ -616,8 +589,7 @@ "Cols": [ 0 ], - "Query": "update /*+ SET_VAR(foreign_key_checks=ON) */ tbl4 set col_ref = null where (col_ref) in ::fkc_vals", - "Table": "tbl4" + "Query": "update /*+ SET_VAR(foreign_key_checks=ON) */ tbl4 set col_ref = null where (col_ref) in ::fkc_vals" }, { "InputName": "Parent", @@ -628,7 +600,6 @@ "Sharded": true }, "Query": "delete /*+ SET_VAR(foreign_key_checks=On) */ from tbl9 where col9 = 34", - "Table": "tbl9", "Values": [ "34" ], @@ -661,8 +632,7 @@ "Sharded": false }, "FieldQuery": "select u_tbl1.col1 from u_tbl1 where 1 != 1", - "Query": "select u_tbl1.col1 from u_tbl1 for update", - "Table": "u_tbl1" + "Query": "select u_tbl1.col1 from u_tbl1 for update" }, { "InputName": "CascadeChild-1", @@ -681,8 +651,7 @@ "Sharded": false }, "FieldQuery": "select u_tbl2.col2 from u_tbl2 where 1 != 1", - "Query": "select u_tbl2.col2 from u_tbl2 where (col2) in ::fkc_vals for update", - "Table": "u_tbl2" + "Query": "select u_tbl2.col2 from u_tbl2 where (col2) in ::fkc_vals for update" }, { "InputName": "CascadeChild-1", @@ -696,8 +665,7 @@ "Cols": [ 0 ], - "Query": "update /*+ SET_VAR(foreign_key_checks=ON) */ u_tbl3 set col3 = null where (col3) in ::fkc_vals1 and (col3) not in ((cast('foo' as CHAR)))", - "Table": "u_tbl3" + "Query": "update /*+ SET_VAR(foreign_key_checks=ON) */ u_tbl3 set col3 = null where (col3) in ::fkc_vals1 and (col3) not in ((cast('foo' as CHAR)))" }, { "InputName": "Parent", @@ -707,8 +675,7 @@ "Name": "unsharded_fk_allow", "Sharded": false }, - "Query": "update /*+ SET_VAR(foreign_key_checks=OFF) */ u_tbl2 set col2 = 'foo' where (col2) in ::fkc_vals", - "Table": "u_tbl2" + "Query": "update /*+ SET_VAR(foreign_key_checks=OFF) */ u_tbl2 set col2 = 'foo' where (col2) in ::fkc_vals" } ] }, @@ -729,8 +696,7 @@ "Sharded": false }, "FieldQuery": "select u_tbl9.col9 from u_tbl9 where 1 != 1", - "Query": "select u_tbl9.col9 from u_tbl9 where (col9) in ::fkc_vals2 and (col9) not in ((cast('foo' as CHAR))) for update nowait", - "Table": "u_tbl9" + "Query": "select u_tbl9.col9 from u_tbl9 where (col9) in ::fkc_vals2 and (col9) not in ((cast('foo' as CHAR))) for update nowait" }, { "InputName": "CascadeChild-1", @@ -744,8 +710,7 @@ "Cols": [ 0 ], - "Query": "update /*+ SET_VAR(foreign_key_checks=ON) */ u_tbl8 set col8 = null where (col8) in ::fkc_vals3", - "Table": "u_tbl8" + "Query": "update /*+ SET_VAR(foreign_key_checks=ON) */ u_tbl8 set col8 = null where (col8) in ::fkc_vals3" }, { "InputName": "Parent", @@ -755,8 +720,7 @@ "Name": "unsharded_fk_allow", "Sharded": false }, - "Query": "update /*+ SET_VAR(foreign_key_checks=ON) */ u_tbl9 set col9 = null where (col9) in ::fkc_vals2 and (col9) not in ((cast('foo' as CHAR)))", - "Table": "u_tbl9" + "Query": "update /*+ SET_VAR(foreign_key_checks=ON) */ u_tbl9 set col9 = null where (col9) in ::fkc_vals2 and (col9) not in ((cast('foo' as CHAR)))" } ] }, @@ -768,8 +732,7 @@ "Name": "unsharded_fk_allow", "Sharded": false }, - "Query": "update /*+ SET_VAR(foreign_key_checks=On) */ u_tbl1 set col1 = 'foo'", - "Table": "u_tbl1" + "Query": "update /*+ SET_VAR(foreign_key_checks=On) */ u_tbl1 set col1 = 'foo'" } ] }, @@ -803,8 +766,7 @@ "Sharded": false }, "FieldQuery": "select u_tbl2.id from u_tbl2 where 1 != 1", - "Query": "select /*+ SET_VAR(foreign_key_checks=On) */ u_tbl2.id from u_tbl2 limit 2 for update", - "Table": "u_tbl2" + "Query": "select /*+ SET_VAR(foreign_key_checks=On) */ u_tbl2.id from u_tbl2 limit 2 for update" }, { "OperatorType": "FkCascade", @@ -818,8 +780,7 @@ "Sharded": false }, "FieldQuery": "select u_tbl2.col2 from u_tbl2 where 1 != 1", - "Query": "select /*+ SET_VAR(foreign_key_checks=On) */ u_tbl2.col2 from u_tbl2 where u_tbl2.id in ::dml_vals for update", - "Table": "u_tbl2" + "Query": "select /*+ SET_VAR(foreign_key_checks=On) */ u_tbl2.col2 from u_tbl2 where u_tbl2.id in ::dml_vals for update" }, { "InputName": "CascadeChild-1", @@ -833,8 +794,7 @@ "Cols": [ 0 ], - "Query": "update /*+ SET_VAR(foreign_key_checks=On) */ u_tbl3 set col3 = null where (col3) in ::fkc_vals and (col3) not in ((cast('bar' as CHAR)))", - "Table": "u_tbl3" + "Query": "update /*+ SET_VAR(foreign_key_checks=On) */ u_tbl3 set col3 = null where (col3) in ::fkc_vals and (col3) not in ((cast('bar' as CHAR)))" }, { "InputName": "Parent", @@ -844,8 +804,7 @@ "Name": "unsharded_fk_allow", "Sharded": false }, - "Query": "update /*+ SET_VAR(foreign_key_checks=On) */ u_tbl2 set col2 = 'bar' where u_tbl2.id in ::dml_vals", - "Table": "u_tbl2" + "Query": "update /*+ SET_VAR(foreign_key_checks=On) */ u_tbl2 set col2 = 'bar' where u_tbl2.id in ::dml_vals" } ] } @@ -876,8 +835,7 @@ "Sharded": false }, "FieldQuery": "select 1 from u_tbl2 left join u_tbl1 on u_tbl1.col1 = cast(u_tbl2.col1 + 'bar' as CHAR) where 1 != 1", - "Query": "select 1 from u_tbl2 left join u_tbl1 on u_tbl1.col1 = cast(u_tbl2.col1 + 'bar' as CHAR) where u_tbl1.col1 is null and cast(u_tbl2.col1 + 'bar' as CHAR) is not null and not (u_tbl2.col2) <=> (cast(u_tbl2.col1 + 'bar' as CHAR)) and u_tbl2.id = 1 limit 1 for share", - "Table": "u_tbl1, u_tbl2" + "Query": "select 1 from u_tbl2 left join u_tbl1 on u_tbl1.col1 = cast(u_tbl2.col1 + 'bar' as CHAR) where u_tbl1.col1 is null and cast(u_tbl2.col1 + 'bar' as CHAR) is not null and not (u_tbl2.col2) <=> (cast(u_tbl2.col1 + 'bar' as CHAR)) and u_tbl2.id = 1 limit 1 for share" }, { "InputName": "PostVerify", @@ -892,8 +850,7 @@ "Sharded": false }, "FieldQuery": "select u_tbl2.col2, col2 <=> cast(col1 + 'bar' as CHAR), cast(col1 + 'bar' as CHAR) from u_tbl2 where 1 != 1", - "Query": "select u_tbl2.col2, col2 <=> cast(col1 + 'bar' as CHAR), cast(col1 + 'bar' as CHAR) from u_tbl2 where id = 1 for update", - "Table": "u_tbl2" + "Query": "select u_tbl2.col2, col2 <=> cast(col1 + 'bar' as CHAR), cast(col1 + 'bar' as CHAR) from u_tbl2 where id = 1 for update" }, { "InputName": "CascadeChild-1", @@ -914,8 +871,7 @@ "UpdateExprBvName": "fkc_upd" } ], - "Query": "update /*+ SET_VAR(foreign_key_checks=ON) */ u_tbl3 set col3 = null where (col3) in ::fkc_vals and (:fkc_upd is null or (col3) not in ((:fkc_upd)))", - "Table": "u_tbl3" + "Query": "update /*+ SET_VAR(foreign_key_checks=ON) */ u_tbl3 set col3 = null where (col3) in ::fkc_vals and (:fkc_upd is null or (col3) not in ((:fkc_upd)))" }, { "InputName": "Parent", @@ -925,8 +881,7 @@ "Name": "unsharded_fk_allow", "Sharded": false }, - "Query": "update /*+ SET_VAR(foreign_key_checks=OFF) */ u_tbl2 set m = 2, col2 = col1 + 'bar' where id = 1", - "Table": "u_tbl2" + "Query": "update /*+ SET_VAR(foreign_key_checks=OFF) */ u_tbl2 set m = 2, col2 = col1 + 'bar' where id = 1" } ] } @@ -958,8 +913,7 @@ "Sharded": false }, "FieldQuery": "select u_tbl1.col1, col1 <=> cast(x + 'bar' as CHAR), cast(x + 'bar' as CHAR) from u_tbl1 where 1 != 1", - "Query": "select u_tbl1.col1, col1 <=> cast(x + 'bar' as CHAR), cast(x + 'bar' as CHAR) from u_tbl1 where id = 1 for update", - "Table": "u_tbl1" + "Query": "select u_tbl1.col1, col1 <=> cast(x + 'bar' as CHAR), cast(x + 'bar' as CHAR) from u_tbl1 where id = 1 for update" }, { "InputName": "CascadeChild-1", @@ -985,8 +939,7 @@ "Sharded": false }, "FieldQuery": "select u_tbl2.col2 from u_tbl2 where 1 != 1", - "Query": "select u_tbl2.col2 from u_tbl2 where (col2) in ::fkc_vals for update", - "Table": "u_tbl2" + "Query": "select u_tbl2.col2 from u_tbl2 where (col2) in ::fkc_vals for update" }, { "InputName": "CascadeChild-1", @@ -1000,8 +953,7 @@ "Cols": [ 0 ], - "Query": "update /*+ SET_VAR(foreign_key_checks=ON) */ u_tbl3 set col3 = null where (col3) in ::fkc_vals1 and (cast(:fkc_upd as CHAR) is null or (col3) not in ((cast(:fkc_upd as CHAR))))", - "Table": "u_tbl3" + "Query": "update /*+ SET_VAR(foreign_key_checks=ON) */ u_tbl3 set col3 = null where (col3) in ::fkc_vals1 and (cast(:fkc_upd as CHAR) is null or (col3) not in ((cast(:fkc_upd as CHAR))))" }, { "InputName": "Parent", @@ -1011,8 +963,7 @@ "Name": "unsharded_fk_allow", "Sharded": false }, - "Query": "update /*+ SET_VAR(foreign_key_checks=OFF) */ u_tbl2 set col2 = :fkc_upd where (col2) in ::fkc_vals", - "Table": "u_tbl2" + "Query": "update /*+ SET_VAR(foreign_key_checks=OFF) */ u_tbl2 set col2 = :fkc_upd where (col2) in ::fkc_vals" } ] }, @@ -1040,8 +991,7 @@ "Sharded": false }, "FieldQuery": "select u_tbl9.col9 from u_tbl9 where 1 != 1", - "Query": "select u_tbl9.col9 from u_tbl9 where (col9) in ::fkc_vals2 and (:fkc_upd1 is null or (col9) not in ((:fkc_upd1))) for update nowait", - "Table": "u_tbl9" + "Query": "select u_tbl9.col9 from u_tbl9 where (col9) in ::fkc_vals2 and (:fkc_upd1 is null or (col9) not in ((:fkc_upd1))) for update nowait" }, { "InputName": "CascadeChild-1", @@ -1055,8 +1005,7 @@ "Cols": [ 0 ], - "Query": "update /*+ SET_VAR(foreign_key_checks=ON) */ u_tbl8 set col8 = null where (col8) in ::fkc_vals3", - "Table": "u_tbl8" + "Query": "update /*+ SET_VAR(foreign_key_checks=ON) */ u_tbl8 set col8 = null where (col8) in ::fkc_vals3" }, { "InputName": "Parent", @@ -1066,8 +1015,7 @@ "Name": "unsharded_fk_allow", "Sharded": false }, - "Query": "update /*+ SET_VAR(foreign_key_checks=ON) */ u_tbl9 set col9 = null where (col9) in ::fkc_vals2 and (:fkc_upd1 is null or (col9) not in ((:fkc_upd1)))", - "Table": "u_tbl9" + "Query": "update /*+ SET_VAR(foreign_key_checks=ON) */ u_tbl9 set col9 = null where (col9) in ::fkc_vals2 and (:fkc_upd1 is null or (col9) not in ((:fkc_upd1)))" } ] }, @@ -1079,8 +1027,7 @@ "Name": "unsharded_fk_allow", "Sharded": false }, - "Query": "update /*+ SET_VAR(foreign_key_checks=OFF) */ u_tbl1 set m = 2, col1 = x + 'bar' where id = 1", - "Table": "u_tbl1" + "Query": "update /*+ SET_VAR(foreign_key_checks=OFF) */ u_tbl1 set m = 2, col1 = x + 'bar' where id = 1" } ] }, @@ -1112,8 +1059,7 @@ "Sharded": false }, "FieldQuery": "select u_tbl2.col2 from u_tbl2 where 1 != 1", - "Query": "select u_tbl2.col2 from u_tbl2 where id = 1 for update", - "Table": "u_tbl2" + "Query": "select u_tbl2.col2 from u_tbl2 where id = 1 for update" }, { "InputName": "CascadeChild-1", @@ -1127,8 +1073,7 @@ "Cols": [ 0 ], - "Query": "update /*+ SET_VAR(foreign_key_checks=ON) */ u_tbl3 set col3 = null where (col3) in ::fkc_vals and (col3) not in ((cast(2 as CHAR)))", - "Table": "u_tbl3" + "Query": "update /*+ SET_VAR(foreign_key_checks=ON) */ u_tbl3 set col3 = null where (col3) in ::fkc_vals and (col3) not in ((cast(2 as CHAR)))" }, { "InputName": "Parent", @@ -1138,8 +1083,7 @@ "Name": "unsharded_fk_allow", "Sharded": false }, - "Query": "update /*+ SET_VAR(foreign_key_checks=On) */ u_tbl2 set m = col1 + 'bar', col2 = 2 where id = 1", - "Table": "u_tbl2" + "Query": "update /*+ SET_VAR(foreign_key_checks=On) */ u_tbl2 set m = col1 + 'bar', col2 = 2 where id = 1" } ] }, @@ -1168,8 +1112,7 @@ "Sharded": false }, "FieldQuery": "select u_tbl1.col1 from u_tbl1 where 1 != 1", - "Query": "select u_tbl1.col1 from u_tbl1 where id = 1 for update", - "Table": "u_tbl1" + "Query": "select u_tbl1.col1 from u_tbl1 where id = 1 for update" }, { "InputName": "CascadeChild-1", @@ -1188,8 +1131,7 @@ "Sharded": false }, "FieldQuery": "select u_tbl2.col2 from u_tbl2 where 1 != 1", - "Query": "select u_tbl2.col2 from u_tbl2 where (col2) in ::fkc_vals for update", - "Table": "u_tbl2" + "Query": "select u_tbl2.col2 from u_tbl2 where (col2) in ::fkc_vals for update" }, { "InputName": "CascadeChild-1", @@ -1203,8 +1145,7 @@ "Cols": [ 0 ], - "Query": "update /*+ SET_VAR(foreign_key_checks=ON) */ u_tbl3 set col3 = null where (col3) in ::fkc_vals1 and (col3) not in ((cast(2 as CHAR)))", - "Table": "u_tbl3" + "Query": "update /*+ SET_VAR(foreign_key_checks=ON) */ u_tbl3 set col3 = null where (col3) in ::fkc_vals1 and (col3) not in ((cast(2 as CHAR)))" }, { "InputName": "Parent", @@ -1214,8 +1155,7 @@ "Name": "unsharded_fk_allow", "Sharded": false }, - "Query": "update /*+ SET_VAR(foreign_key_checks=OFF) */ u_tbl2 set col2 = 2 where (col2) in ::fkc_vals", - "Table": "u_tbl2" + "Query": "update /*+ SET_VAR(foreign_key_checks=OFF) */ u_tbl2 set col2 = 2 where (col2) in ::fkc_vals" } ] }, @@ -1236,8 +1176,7 @@ "Sharded": false }, "FieldQuery": "select u_tbl9.col9 from u_tbl9 where 1 != 1", - "Query": "select u_tbl9.col9 from u_tbl9 where (col9) in ::fkc_vals2 and (col9) not in ((cast(2 as CHAR))) for update nowait", - "Table": "u_tbl9" + "Query": "select u_tbl9.col9 from u_tbl9 where (col9) in ::fkc_vals2 and (col9) not in ((cast(2 as CHAR))) for update nowait" }, { "InputName": "CascadeChild-1", @@ -1251,8 +1190,7 @@ "Cols": [ 0 ], - "Query": "update /*+ SET_VAR(foreign_key_checks=ON) */ u_tbl8 set col8 = null where (col8) in ::fkc_vals3", - "Table": "u_tbl8" + "Query": "update /*+ SET_VAR(foreign_key_checks=ON) */ u_tbl8 set col8 = null where (col8) in ::fkc_vals3" }, { "InputName": "Parent", @@ -1262,8 +1200,7 @@ "Name": "unsharded_fk_allow", "Sharded": false }, - "Query": "update /*+ SET_VAR(foreign_key_checks=ON) */ u_tbl9 set col9 = null where (col9) in ::fkc_vals2 and (col9) not in ((cast(2 as CHAR)))", - "Table": "u_tbl9" + "Query": "update /*+ SET_VAR(foreign_key_checks=ON) */ u_tbl9 set col9 = null where (col9) in ::fkc_vals2 and (col9) not in ((cast(2 as CHAR)))" } ] }, @@ -1275,8 +1212,7 @@ "Name": "unsharded_fk_allow", "Sharded": false }, - "Query": "update /*+ SET_VAR(foreign_key_checks=On) */ u_tbl1 set m = x + 'bar', col1 = 2 where id = 1", - "Table": "u_tbl1" + "Query": "update /*+ SET_VAR(foreign_key_checks=On) */ u_tbl1 set m = x + 'bar', col1 = 2 where id = 1" } ] }, @@ -1315,8 +1251,7 @@ "Sharded": false }, "FieldQuery": "select u_tbl2.id from u_tbl2 where 1 != 1", - "Query": "select /*+ SET_VAR(foreign_key_checks=On) */ u_tbl2.id from u_tbl2 limit 2 for update", - "Table": "u_tbl2" + "Query": "select /*+ SET_VAR(foreign_key_checks=On) */ u_tbl2.id from u_tbl2 limit 2 for update" }, { "OperatorType": "FkCascade", @@ -1330,8 +1265,7 @@ "Sharded": false }, "FieldQuery": "select u_tbl2.col2 from u_tbl2 where 1 != 1", - "Query": "select /*+ SET_VAR(foreign_key_checks=On) */ u_tbl2.col2 from u_tbl2 where u_tbl2.id in ::dml_vals for update", - "Table": "u_tbl2" + "Query": "select /*+ SET_VAR(foreign_key_checks=On) */ u_tbl2.col2 from u_tbl2 where u_tbl2.id in ::dml_vals for update" }, { "InputName": "CascadeChild-1", @@ -1345,8 +1279,7 @@ "Cols": [ 0 ], - "Query": "update /*+ SET_VAR(foreign_key_checks=On) */ u_tbl3 set col3 = null where (col3) in ::fkc_vals", - "Table": "u_tbl3" + "Query": "update /*+ SET_VAR(foreign_key_checks=On) */ u_tbl3 set col3 = null where (col3) in ::fkc_vals" }, { "InputName": "Parent", @@ -1356,8 +1289,7 @@ "Name": "unsharded_fk_allow", "Sharded": false }, - "Query": "delete /*+ SET_VAR(foreign_key_checks=On) */ from u_tbl2 where u_tbl2.id in ::dml_vals", - "Table": "u_tbl2" + "Query": "delete /*+ SET_VAR(foreign_key_checks=On) */ from u_tbl2 where u_tbl2.id in ::dml_vals" } ] } @@ -1401,7 +1333,6 @@ "JoinVars": { "tbl3_colx": 0 }, - "TableName": "tbl3_tbl1", "Inputs": [ { "OperatorType": "Route", @@ -1411,8 +1342,7 @@ "Sharded": true }, "FieldQuery": "select tbl3.colx from tbl3 where 1 != 1", - "Query": "select tbl3.colx from tbl3 where tbl3.colx + 10 is not null and not (tbl3.coly) <=> (tbl3.colx + 10) and tbl3.coly = 10 for share", - "Table": "tbl3" + "Query": "select tbl3.colx from tbl3 where tbl3.colx + 10 is not null and not (tbl3.coly) <=> (tbl3.colx + 10) and tbl3.coly = 10 for share" }, { "OperatorType": "Route", @@ -1422,8 +1352,7 @@ "Sharded": true }, "FieldQuery": "select tbl1.t1col1 from tbl1 where 1 != 1", - "Query": "select tbl1.t1col1 from tbl1 where tbl1.t1col1 = :tbl3_colx + 10 for share", - "Table": "tbl1" + "Query": "select tbl1.t1col1 from tbl1 where tbl1.t1col1 = :tbl3_colx + 10 for share" } ] } @@ -1441,8 +1370,7 @@ "Name": "sharded_fk_allow", "Sharded": true }, - "Query": "update /*+ SET_VAR(foreign_key_checks=OFF) */ tbl3 set coly = colx + 10 where coly = 10", - "Table": "tbl3" + "Query": "update /*+ SET_VAR(foreign_key_checks=OFF) */ tbl3 set coly = colx + 10 where coly = 10" } ] }, @@ -1481,7 +1409,6 @@ "OperatorType": "Join", "Variant": "LeftJoin", "JoinColumnIndexes": "R:0", - "TableName": "tbl3_tbl1", "Inputs": [ { "OperatorType": "Route", @@ -1491,8 +1418,7 @@ "Sharded": true }, "FieldQuery": "select 1 from tbl3 where 1 != 1", - "Query": "select 1 from tbl3 where not (tbl3.coly) <=> (20) and tbl3.coly = 10 for share", - "Table": "tbl3" + "Query": "select 1 from tbl3 where not (tbl3.coly) <=> (20) and tbl3.coly = 10 for share" }, { "OperatorType": "Route", @@ -1502,8 +1428,7 @@ "Sharded": true }, "FieldQuery": "select tbl1.t1col1 from tbl1 where 1 != 1", - "Query": "select tbl1.t1col1 from tbl1 where tbl1.t1col1 = 20 for share", - "Table": "tbl1" + "Query": "select tbl1.t1col1 from tbl1 where tbl1.t1col1 = 20 for share" } ] } @@ -1521,8 +1446,7 @@ "Name": "sharded_fk_allow", "Sharded": true }, - "Query": "update /*+ SET_VAR(foreign_key_checks=On) */ tbl3 set coly = 20 where coly = 10", - "Table": "tbl3" + "Query": "update /*+ SET_VAR(foreign_key_checks=On) */ tbl3 set coly = 20 where coly = 10" } ] }, @@ -1551,8 +1475,7 @@ "Sharded": false }, "FieldQuery": "select u_tbl6.col6 from u_tbl6 where 1 != 1", - "Query": "select u_tbl6.col6 from u_tbl6 for update", - "Table": "u_tbl6" + "Query": "select u_tbl6.col6 from u_tbl6 for update" }, { "InputName": "CascadeChild-1", @@ -1571,8 +1494,7 @@ "Sharded": false }, "FieldQuery": "select 1 from u_tbl8 left join u_tbl9 on u_tbl9.col9 = cast('foo' as CHAR) where 1 != 1", - "Query": "select 1 from u_tbl8 left join u_tbl9 on u_tbl9.col9 = cast('foo' as CHAR) where u_tbl9.col9 is null and not (u_tbl8.col8) <=> (cast('foo' as CHAR)) and (u_tbl8.col8) in ::fkc_vals limit 1 for share nowait", - "Table": "u_tbl8, u_tbl9" + "Query": "select 1 from u_tbl8 left join u_tbl9 on u_tbl9.col9 = cast('foo' as CHAR) where u_tbl9.col9 is null and not (u_tbl8.col8) <=> (cast('foo' as CHAR)) and (u_tbl8.col8) in ::fkc_vals limit 1 for share nowait" }, { "InputName": "PostVerify", @@ -1582,8 +1504,7 @@ "Name": "unsharded_fk_allow", "Sharded": false }, - "Query": "update /*+ SET_VAR(foreign_key_checks=OFF) */ u_tbl8 set col8 = 'foo' where (col8) in ::fkc_vals", - "Table": "u_tbl8" + "Query": "update /*+ SET_VAR(foreign_key_checks=OFF) */ u_tbl8 set col8 = 'foo' where (col8) in ::fkc_vals" } ] }, @@ -1595,8 +1516,7 @@ "Name": "unsharded_fk_allow", "Sharded": false }, - "Query": "update /*+ SET_VAR(foreign_key_checks=On) */ u_tbl6 set col6 = 'foo'", - "Table": "u_tbl6" + "Query": "update /*+ SET_VAR(foreign_key_checks=On) */ u_tbl6 set col6 = 'foo'" } ] }, @@ -1626,8 +1546,7 @@ "Sharded": false }, "FieldQuery": "select u_tbl7.col7 from u_tbl7 where 1 != 1", - "Query": "select u_tbl7.col7 from u_tbl7 for update", - "Table": "u_tbl7" + "Query": "select u_tbl7.col7 from u_tbl7 for update" }, { "InputName": "CascadeChild-1", @@ -1646,8 +1565,7 @@ "Sharded": false }, "FieldQuery": "select 1 from u_tbl4 left join u_tbl3 on u_tbl3.col3 = cast('foo' as CHAR) where 1 != 1", - "Query": "select 1 from u_tbl4 left join u_tbl3 on u_tbl3.col3 = cast('foo' as CHAR) where u_tbl3.col3 is null and not (u_tbl4.col4) <=> (cast('foo' as CHAR)) and (u_tbl4.col4) in ::fkc_vals limit 1 for share", - "Table": "u_tbl3, u_tbl4" + "Query": "select 1 from u_tbl4 left join u_tbl3 on u_tbl3.col3 = cast('foo' as CHAR) where u_tbl3.col3 is null and not (u_tbl4.col4) <=> (cast('foo' as CHAR)) and (u_tbl4.col4) in ::fkc_vals limit 1 for share" }, { "InputName": "VerifyChild-2", @@ -1658,8 +1576,7 @@ "Sharded": false }, "FieldQuery": "select 1 from u_tbl4, u_tbl9 where 1 != 1", - "Query": "select 1 from u_tbl4, u_tbl9 where u_tbl4.col4 = u_tbl9.col9 and (u_tbl4.col4) in ::fkc_vals and (u_tbl9.col9) not in ((cast('foo' as CHAR))) limit 1 for share", - "Table": "u_tbl4, u_tbl9" + "Query": "select 1 from u_tbl4, u_tbl9 where u_tbl4.col4 = u_tbl9.col9 and (u_tbl4.col4) in ::fkc_vals and (u_tbl9.col9) not in ((cast('foo' as CHAR))) limit 1 for share" }, { "InputName": "PostVerify", @@ -1669,8 +1586,7 @@ "Name": "unsharded_fk_allow", "Sharded": false }, - "Query": "update /*+ SET_VAR(foreign_key_checks=OFF) */ u_tbl4 set col4 = 'foo' where (col4) in ::fkc_vals", - "Table": "u_tbl4" + "Query": "update /*+ SET_VAR(foreign_key_checks=OFF) */ u_tbl4 set col4 = 'foo' where (col4) in ::fkc_vals" } ] }, @@ -1682,8 +1598,7 @@ "Name": "unsharded_fk_allow", "Sharded": false }, - "Query": "update /*+ SET_VAR(foreign_key_checks=On) */ u_tbl7 set col7 = 'foo'", - "Table": "u_tbl7" + "Query": "update /*+ SET_VAR(foreign_key_checks=On) */ u_tbl7 set col7 = 'foo'" } ] }, @@ -1714,8 +1629,7 @@ "Sharded": false }, "FieldQuery": "select u_tbl7.col7 from u_tbl7 where 1 != 1", - "Query": "select u_tbl7.col7 from u_tbl7 for update", - "Table": "u_tbl7" + "Query": "select u_tbl7.col7 from u_tbl7 for update" }, { "InputName": "CascadeChild-1", @@ -1734,8 +1648,7 @@ "Sharded": false }, "FieldQuery": "select 1 from u_tbl4 left join u_tbl3 on u_tbl3.col3 = cast(:v1 as CHAR) where 1 != 1", - "Query": "select 1 from u_tbl4 left join u_tbl3 on u_tbl3.col3 = cast(:v1 as CHAR) where u_tbl3.col3 is null and cast(:v1 as CHAR) is not null and not (u_tbl4.col4) <=> (cast(:v1 as CHAR)) and (u_tbl4.col4) in ::fkc_vals limit 1 for share", - "Table": "u_tbl3, u_tbl4" + "Query": "select 1 from u_tbl4 left join u_tbl3 on u_tbl3.col3 = cast(:v1 as CHAR) where u_tbl3.col3 is null and cast(:v1 as CHAR) is not null and not (u_tbl4.col4) <=> (cast(:v1 as CHAR)) and (u_tbl4.col4) in ::fkc_vals limit 1 for share" }, { "InputName": "VerifyChild-2", @@ -1746,8 +1659,7 @@ "Sharded": false }, "FieldQuery": "select 1 from u_tbl4, u_tbl9 where 1 != 1", - "Query": "select 1 from u_tbl4, u_tbl9 where u_tbl4.col4 = u_tbl9.col9 and (u_tbl4.col4) in ::fkc_vals and (cast(:v1 as CHAR) is null or (u_tbl9.col9) not in ((cast(:v1 as CHAR)))) limit 1 for share", - "Table": "u_tbl4, u_tbl9" + "Query": "select 1 from u_tbl4, u_tbl9 where u_tbl4.col4 = u_tbl9.col9 and (u_tbl4.col4) in ::fkc_vals and (cast(:v1 as CHAR) is null or (u_tbl9.col9) not in ((cast(:v1 as CHAR)))) limit 1 for share" }, { "InputName": "PostVerify", @@ -1757,8 +1669,7 @@ "Name": "unsharded_fk_allow", "Sharded": false }, - "Query": "update /*+ SET_VAR(foreign_key_checks=OFF) */ u_tbl4 set col4 = :v1 where (col4) in ::fkc_vals", - "Table": "u_tbl4" + "Query": "update /*+ SET_VAR(foreign_key_checks=OFF) */ u_tbl4 set col4 = :v1 where (col4) in ::fkc_vals" } ] }, @@ -1770,8 +1681,7 @@ "Name": "unsharded_fk_allow", "Sharded": false }, - "Query": "update /*+ SET_VAR(foreign_key_checks=On) */ u_tbl7 set col7 = :v1", - "Table": "u_tbl7" + "Query": "update /*+ SET_VAR(foreign_key_checks=On) */ u_tbl7 set col7 = :v1" } ] }, @@ -1802,8 +1712,7 @@ "Sharded": false }, "NoAutoCommit": true, - "Query": "insert /*+ SET_VAR(foreign_key_checks=On) */ into u_tbl1(id, col1) values (1, 3)", - "TableName": "u_tbl1" + "Query": "insert /*+ SET_VAR(foreign_key_checks=On) */ into u_tbl1(id, col1) values (1, 3)" }, { "InputName": "Update-1", @@ -1818,8 +1727,7 @@ "Sharded": false }, "FieldQuery": "select u_tbl1.col1 from u_tbl1 where 1 != 1", - "Query": "select u_tbl1.col1 from u_tbl1 where id = 1 for update", - "Table": "u_tbl1" + "Query": "select u_tbl1.col1 from u_tbl1 where id = 1 for update" }, { "InputName": "CascadeChild-1", @@ -1838,8 +1746,7 @@ "Sharded": false }, "FieldQuery": "select u_tbl2.col2 from u_tbl2 where 1 != 1", - "Query": "select u_tbl2.col2 from u_tbl2 where (col2) in ::fkc_vals for update", - "Table": "u_tbl2" + "Query": "select u_tbl2.col2 from u_tbl2 where (col2) in ::fkc_vals for update" }, { "InputName": "CascadeChild-1", @@ -1853,8 +1760,7 @@ "Cols": [ 0 ], - "Query": "update /*+ SET_VAR(foreign_key_checks=ON) */ u_tbl3 set col3 = null where (col3) in ::fkc_vals1 and (col3) not in ((cast(5 as CHAR)))", - "Table": "u_tbl3" + "Query": "update /*+ SET_VAR(foreign_key_checks=ON) */ u_tbl3 set col3 = null where (col3) in ::fkc_vals1 and (col3) not in ((cast(5 as CHAR)))" }, { "InputName": "Parent", @@ -1864,8 +1770,7 @@ "Name": "unsharded_fk_allow", "Sharded": false }, - "Query": "update /*+ SET_VAR(foreign_key_checks=OFF) */ u_tbl2 set col2 = 5 where (col2) in ::fkc_vals", - "Table": "u_tbl2" + "Query": "update /*+ SET_VAR(foreign_key_checks=OFF) */ u_tbl2 set col2 = 5 where (col2) in ::fkc_vals" } ] }, @@ -1886,8 +1791,7 @@ "Sharded": false }, "FieldQuery": "select u_tbl9.col9 from u_tbl9 where 1 != 1", - "Query": "select u_tbl9.col9 from u_tbl9 where (col9) in ::fkc_vals2 and (col9) not in ((cast(5 as CHAR))) for update nowait", - "Table": "u_tbl9" + "Query": "select u_tbl9.col9 from u_tbl9 where (col9) in ::fkc_vals2 and (col9) not in ((cast(5 as CHAR))) for update nowait" }, { "InputName": "CascadeChild-1", @@ -1901,8 +1805,7 @@ "Cols": [ 0 ], - "Query": "update /*+ SET_VAR(foreign_key_checks=ON) */ u_tbl8 set col8 = null where (col8) in ::fkc_vals3", - "Table": "u_tbl8" + "Query": "update /*+ SET_VAR(foreign_key_checks=ON) */ u_tbl8 set col8 = null where (col8) in ::fkc_vals3" }, { "InputName": "Parent", @@ -1912,8 +1815,7 @@ "Name": "unsharded_fk_allow", "Sharded": false }, - "Query": "update /*+ SET_VAR(foreign_key_checks=ON) */ u_tbl9 set col9 = null where (col9) in ::fkc_vals2 and (col9) not in ((cast(5 as CHAR)))", - "Table": "u_tbl9" + "Query": "update /*+ SET_VAR(foreign_key_checks=ON) */ u_tbl9 set col9 = null where (col9) in ::fkc_vals2 and (col9) not in ((cast(5 as CHAR)))" } ] }, @@ -1925,8 +1827,7 @@ "Name": "unsharded_fk_allow", "Sharded": false }, - "Query": "update /*+ SET_VAR(foreign_key_checks=On) */ u_tbl1 set col1 = 5 where id = 1", - "Table": "u_tbl1" + "Query": "update /*+ SET_VAR(foreign_key_checks=On) */ u_tbl1 set col1 = 5 where id = 1" } ] } @@ -1955,8 +1856,7 @@ "Name": "unsharded_fk_allow", "Sharded": false }, - "Query": "insert /*+ SET_VAR(foreign_key_checks=On) */ into u_tbl1(id, col1, foo) values (1, 3, 'bar') on duplicate key update foo = 'baz'", - "TableName": "u_tbl1" + "Query": "insert /*+ SET_VAR(foreign_key_checks=On) */ into u_tbl1(id, col1, foo) values (1, 3, 'bar') on duplicate key update foo = 'baz'" }, "TablesUsed": [ "unsharded_fk_allow.u_tbl1" @@ -1990,8 +1890,7 @@ "Sharded": false }, "FieldQuery": "select u_tbl1.col1 from u_tbl1 where 1 != 1", - "Query": "select u_tbl1.col1 from u_tbl1 where (id) in ((1)) for update", - "Table": "u_tbl1" + "Query": "select u_tbl1.col1 from u_tbl1 where (id) in ((1)) for update" }, { "InputName": "CascadeChild-1", @@ -2010,8 +1909,7 @@ "Sharded": false }, "FieldQuery": "select u_tbl2.col2 from u_tbl2 where 1 != 1", - "Query": "select u_tbl2.col2 from u_tbl2 where (col2) in ::fkc_vals for update", - "Table": "u_tbl2" + "Query": "select u_tbl2.col2 from u_tbl2 where (col2) in ::fkc_vals for update" }, { "InputName": "CascadeChild-1", @@ -2025,8 +1923,7 @@ "Cols": [ 0 ], - "Query": "update /*+ SET_VAR(foreign_key_checks=ON) */ u_tbl3 set col3 = null where (col3) in ::fkc_vals1", - "Table": "u_tbl3" + "Query": "update /*+ SET_VAR(foreign_key_checks=ON) */ u_tbl3 set col3 = null where (col3) in ::fkc_vals1" }, { "InputName": "Parent", @@ -2036,8 +1933,7 @@ "Name": "unsharded_fk_allow", "Sharded": false }, - "Query": "delete /*+ SET_VAR(foreign_key_checks=ON) */ from u_tbl2 where (col2) in ::fkc_vals", - "Table": "u_tbl2" + "Query": "delete /*+ SET_VAR(foreign_key_checks=ON) */ from u_tbl2 where (col2) in ::fkc_vals" } ] }, @@ -2049,8 +1945,7 @@ "Name": "unsharded_fk_allow", "Sharded": false }, - "Query": "delete /*+ SET_VAR(foreign_key_checks=On) */ from u_tbl1 where (id) in ((1))", - "Table": "u_tbl1" + "Query": "delete /*+ SET_VAR(foreign_key_checks=On) */ from u_tbl1 where (id) in ((1))" } ] }, @@ -2062,8 +1957,7 @@ "Sharded": false }, "NoAutoCommit": true, - "Query": "insert /*+ SET_VAR(foreign_key_checks=On) */ into u_tbl1(id, col1) values (1, 2)", - "TableName": "u_tbl1" + "Query": "insert /*+ SET_VAR(foreign_key_checks=On) */ into u_tbl1(id, col1) values (1, 2)" } ] }, @@ -2093,8 +1987,7 @@ "Sharded": false }, "FieldQuery": "select u_multicol_tbl1.cola, u_multicol_tbl1.colb from u_multicol_tbl1 where 1 != 1", - "Query": "select u_multicol_tbl1.cola, u_multicol_tbl1.colb from u_multicol_tbl1 where id = 3 for update", - "Table": "u_multicol_tbl1" + "Query": "select u_multicol_tbl1.cola, u_multicol_tbl1.colb from u_multicol_tbl1 where id = 3 for update" }, { "InputName": "CascadeChild-1", @@ -2114,8 +2007,7 @@ "Sharded": false }, "FieldQuery": "select u_multicol_tbl2.cola, u_multicol_tbl2.colb from u_multicol_tbl2 where 1 != 1", - "Query": "select u_multicol_tbl2.cola, u_multicol_tbl2.colb from u_multicol_tbl2 where (cola, colb) in ::fkc_vals and (cola, colb) not in ((1, 2)) for update", - "Table": "u_multicol_tbl2" + "Query": "select u_multicol_tbl2.cola, u_multicol_tbl2.colb from u_multicol_tbl2 where (cola, colb) in ::fkc_vals and (cola, colb) not in ((1, 2)) for update" }, { "InputName": "CascadeChild-1", @@ -2130,8 +2022,7 @@ 0, 1 ], - "Query": "update /*+ SET_VAR(foreign_key_checks=OFF) */ u_multicol_tbl3 set cola = null, colb = null where (cola, colb) in ::fkc_vals1", - "Table": "u_multicol_tbl3" + "Query": "update /*+ SET_VAR(foreign_key_checks=OFF) */ u_multicol_tbl3 set cola = null, colb = null where (cola, colb) in ::fkc_vals1" }, { "InputName": "Parent", @@ -2141,8 +2032,7 @@ "Name": "unsharded_fk_allow", "Sharded": false }, - "Query": "update /*+ SET_VAR(foreign_key_checks=ON) */ u_multicol_tbl2 set cola = null, colb = null where (cola, colb) in ::fkc_vals and (cola, colb) not in ((1, 2))", - "Table": "u_multicol_tbl2" + "Query": "update /*+ SET_VAR(foreign_key_checks=ON) */ u_multicol_tbl2 set cola = null, colb = null where (cola, colb) in ::fkc_vals and (cola, colb) not in ((1, 2))" } ] }, @@ -2154,8 +2044,7 @@ "Name": "unsharded_fk_allow", "Sharded": false }, - "Query": "update /*+ SET_VAR(foreign_key_checks=On) */ u_multicol_tbl1 set cola = 1, colb = 2 where id = 3", - "Table": "u_multicol_tbl1" + "Query": "update /*+ SET_VAR(foreign_key_checks=On) */ u_multicol_tbl1 set cola = 1, colb = 2 where id = 3" } ] }, @@ -2185,8 +2074,7 @@ "Sharded": false }, "FieldQuery": "select u_multicol_tbl1.cola, u_multicol_tbl1.colb from u_multicol_tbl1 where 1 != 1", - "Query": "select u_multicol_tbl1.cola, u_multicol_tbl1.colb from u_multicol_tbl1 where id = :v3 for update", - "Table": "u_multicol_tbl1" + "Query": "select u_multicol_tbl1.cola, u_multicol_tbl1.colb from u_multicol_tbl1 where id = :v3 for update" }, { "InputName": "CascadeChild-1", @@ -2206,8 +2094,7 @@ "Sharded": false }, "FieldQuery": "select u_multicol_tbl2.cola, u_multicol_tbl2.colb from u_multicol_tbl2 where 1 != 1", - "Query": "select u_multicol_tbl2.cola, u_multicol_tbl2.colb from u_multicol_tbl2 where (cola, colb) in ::fkc_vals and (:v2 is null or (:v1 is null or (cola, colb) not in ((:v1, :v2)))) for update", - "Table": "u_multicol_tbl2" + "Query": "select u_multicol_tbl2.cola, u_multicol_tbl2.colb from u_multicol_tbl2 where (cola, colb) in ::fkc_vals and (:v2 is null or (:v1 is null or (cola, colb) not in ((:v1, :v2)))) for update" }, { "InputName": "CascadeChild-1", @@ -2222,8 +2109,7 @@ 0, 1 ], - "Query": "update /*+ SET_VAR(foreign_key_checks=OFF) */ u_multicol_tbl3 set cola = null, colb = null where (cola, colb) in ::fkc_vals1", - "Table": "u_multicol_tbl3" + "Query": "update /*+ SET_VAR(foreign_key_checks=OFF) */ u_multicol_tbl3 set cola = null, colb = null where (cola, colb) in ::fkc_vals1" }, { "InputName": "Parent", @@ -2233,8 +2119,7 @@ "Name": "unsharded_fk_allow", "Sharded": false }, - "Query": "update /*+ SET_VAR(foreign_key_checks=ON) */ u_multicol_tbl2 set cola = null, colb = null where (cola, colb) in ::fkc_vals and (:v2 is null or (:v1 is null or (cola, colb) not in ((:v1, :v2))))", - "Table": "u_multicol_tbl2" + "Query": "update /*+ SET_VAR(foreign_key_checks=ON) */ u_multicol_tbl2 set cola = null, colb = null where (cola, colb) in ::fkc_vals and (:v2 is null or (:v1 is null or (cola, colb) not in ((:v1, :v2))))" } ] }, @@ -2246,8 +2131,7 @@ "Name": "unsharded_fk_allow", "Sharded": false }, - "Query": "update /*+ SET_VAR(foreign_key_checks=On) */ u_multicol_tbl1 set cola = :v1, colb = :v2 where id = :v3", - "Table": "u_multicol_tbl1" + "Query": "update /*+ SET_VAR(foreign_key_checks=On) */ u_multicol_tbl1 set cola = :v1, colb = :v2 where id = :v3" } ] }, @@ -2283,8 +2167,7 @@ "Sharded": true }, "FieldQuery": "select tbl5.col5, tbl5.t5col5 from tbl5 where 1 != 1", - "Query": "select tbl5.col5, tbl5.t5col5 from tbl5 where id = :v1 for update", - "Table": "tbl5" + "Query": "select tbl5.col5, tbl5.t5col5 from tbl5 where id = :v1 for update" }, { "InputName": "CascadeChild-1", @@ -2299,7 +2182,6 @@ 0 ], "Query": "delete /*+ SET_VAR(foreign_key_checks=ON) */ from tbl4 where (col4) in ::fkc_vals", - "Table": "tbl4", "Values": [ "fkc_vals:0" ], @@ -2317,8 +2199,7 @@ "Cols": [ 1 ], - "Query": "delete /*+ SET_VAR(foreign_key_checks=ON) */ from tbl4 where (t4col4) in ::fkc_vals1", - "Table": "tbl4" + "Query": "delete /*+ SET_VAR(foreign_key_checks=ON) */ from tbl4 where (t4col4) in ::fkc_vals1" }, { "InputName": "Parent", @@ -2328,8 +2209,7 @@ "Name": "sharded_fk_allow", "Sharded": true }, - "Query": "delete /*+ SET_VAR(foreign_key_checks=On) */ from tbl5 where id = :v1", - "Table": "tbl5" + "Query": "delete /*+ SET_VAR(foreign_key_checks=On) */ from tbl5 where id = :v1" } ] } @@ -2356,7 +2236,6 @@ "Sharded": true }, "Query": "delete /*+ SET_VAR(foreign_key_checks=Off) */ from multicol_tbl1 where cola = 1 and colb = 2 and colc = 3", - "Table": "multicol_tbl1", "Values": [ "1", "2", @@ -2383,8 +2262,7 @@ "Name": "unsharded_fk_allow", "Sharded": false }, - "Query": "update /*+ SET_VAR(foreign_key_checks=Off) */ u_multicol_tbl1 set cola = 1, colb = 2 where id = 3", - "Table": "u_multicol_tbl1" + "Query": "update /*+ SET_VAR(foreign_key_checks=Off) */ u_multicol_tbl1 set cola = 1, colb = 2 where id = 3" }, "TablesUsed": [ "unsharded_fk_allow.u_multicol_tbl1" @@ -2406,7 +2284,6 @@ "Sharded": true }, "Query": "insert /*+ SET_VAR(foreign_key_checks=Off) */ into tbl3(col3, coly) values (:_col3_0, 3)", - "TableName": "tbl3", "VindexValues": { "hash_vin": "1" } diff --git a/go/vt/vtgate/planbuilder/testdata/from_cases.json b/go/vt/vtgate/planbuilder/testdata/from_cases.json index 6bf1be3618b..0420fe38515 100644 --- a/go/vt/vtgate/planbuilder/testdata/from_cases.json +++ b/go/vt/vtgate/planbuilder/testdata/from_cases.json @@ -14,8 +14,7 @@ "Sharded": true }, "FieldQuery": "select col from `user` where 1 != 1", - "Query": "select col from `user`", - "Table": "`user`" + "Query": "select col from `user`" }, "TablesUsed": [ "user.user" @@ -37,8 +36,7 @@ "Sharded": false }, "FieldQuery": "select col from unsharded where 1 != 1", - "Query": "select col from unsharded", - "Table": "unsharded" + "Query": "select col from unsharded" }, "TablesUsed": [ "main.unsharded" @@ -60,8 +58,7 @@ "Sharded": false }, "FieldQuery": "select next 2 values from seq where 1 != 1", - "Query": "select next 2 values from seq", - "Table": "seq" + "Query": "select next 2 values from seq" }, "TablesUsed": [ "main.seq" @@ -108,8 +105,7 @@ "Sharded": true }, "FieldQuery": "select * from ref where 1 != 1", - "Query": "select * from ref", - "Table": "ref" + "Query": "select * from ref" }, "TablesUsed": [ "user.ref" @@ -131,8 +127,7 @@ "Sharded": false }, "FieldQuery": "select m1.col from unsharded as m1 join unsharded as m2 where 1 != 1", - "Query": "select m1.col from unsharded as m1 join unsharded as m2", - "Table": "unsharded" + "Query": "select m1.col from unsharded as m1 join unsharded as m2" }, "TablesUsed": [ "main.unsharded" @@ -150,7 +145,6 @@ "OperatorType": "Join", "Variant": "Join", "JoinColumnIndexes": "R:0", - "TableName": "`user`_music", "Inputs": [ { "OperatorType": "Route", @@ -160,8 +154,7 @@ "Sharded": true }, "FieldQuery": "select 1 from `user` where 1 != 1", - "Query": "select 1 from `user`", - "Table": "`user`" + "Query": "select 1 from `user`" }, { "OperatorType": "Route", @@ -171,8 +164,7 @@ "Sharded": true }, "FieldQuery": "select music.col from music where 1 != 1", - "Query": "select music.col from music", - "Table": "music" + "Query": "select music.col from music" } ] }, @@ -197,8 +189,7 @@ "Sharded": true }, "FieldQuery": "select * from `user` where 1 != 1", - "Query": "select * from `user`", - "Table": "`user`" + "Query": "select * from `user`" }, "TablesUsed": [ "user.user" @@ -220,8 +211,7 @@ "Sharded": true }, "FieldQuery": "select * from `user` as a where 1 != 1", - "Query": "select * from `user` as a", - "Table": "`user`" + "Query": "select * from `user` as a" }, "TablesUsed": [ "user.user" @@ -243,8 +233,7 @@ "Sharded": true }, "FieldQuery": "select * from `user` as route1 where 1 != 1", - "Query": "select * from `user` as route1", - "Table": "`user`" + "Query": "select * from `user` as route1" }, "TablesUsed": [ "user.user" @@ -266,8 +255,7 @@ "Sharded": true }, "FieldQuery": "select * from `user` as a where 1 != 1", - "Query": "select * from `user` as a", - "Table": "`user`" + "Query": "select * from `user` as a" }, "TablesUsed": [ "user.user" @@ -289,8 +277,7 @@ "Sharded": true }, "FieldQuery": "select * from `user` as primary_redirect where 1 != 1", - "Query": "select * from `user` as primary_redirect", - "Table": "`user`" + "Query": "select * from `user` as primary_redirect" }, "TablesUsed": [ "user.user" @@ -322,8 +309,7 @@ "Sharded": true }, "FieldQuery": "select foo.col from `user` as foo, `user` where 1 != 1", - "Query": "select foo.col from `user` as foo, `user` where foo.col = 42 and foo.id = `user`.id", - "Table": "`user`" + "Query": "select foo.col from `user` as foo, `user` where foo.col = 42 and foo.id = `user`.id" }, "TablesUsed": [ "user.user" @@ -344,7 +330,6 @@ "JoinVars": { "music_id": 1 }, - "TableName": "music_`user`", "Inputs": [ { "OperatorType": "Route", @@ -354,8 +339,7 @@ "Sharded": true }, "FieldQuery": "select music.foo, music.id from music where 1 != 1", - "Query": "select music.foo, music.id from music where music.col = 42", - "Table": "music" + "Query": "select music.foo, music.id from music where music.col = 42" }, { "OperatorType": "Route", @@ -366,7 +350,6 @@ }, "FieldQuery": "select 1 from `user` where 1 != 1", "Query": "select 1 from `user` where `user`.id = :music_id", - "Table": "`user`", "Values": [ ":music_id" ], @@ -391,7 +374,6 @@ "OperatorType": "Join", "Variant": "Join", "JoinColumnIndexes": "R:0", - "TableName": "`user`_music", "Inputs": [ { "OperatorType": "Route", @@ -401,8 +383,7 @@ "Sharded": true }, "FieldQuery": "select 1 from `user` where 1 != 1", - "Query": "select 1 from `user`", - "Table": "`user`" + "Query": "select 1 from `user`" }, { "OperatorType": "Route", @@ -412,8 +393,7 @@ "Sharded": true }, "FieldQuery": "select music.col from music where 1 != 1", - "Query": "select music.col from music", - "Table": "music" + "Query": "select music.col from music" } ] }, @@ -438,8 +418,7 @@ "Sharded": true }, "FieldQuery": "select `name` from (select `name` from `user` where 1 != 1) as t where 1 != 1", - "Query": "select `name` from (select distinct `name` from `user`) as t", - "Table": "`user`" + "Query": "select `name` from (select distinct `name` from `user`) as t" }, "TablesUsed": [ "user.user" @@ -461,8 +440,7 @@ "Sharded": false }, "FieldQuery": "select u1.a, u2.a from unsharded as u1, unsharded as u2 where 1 != 1", - "Query": "select u1.a, u2.a from unsharded as u1, unsharded as u2", - "Table": "unsharded" + "Query": "select u1.a, u2.a from unsharded as u1, unsharded as u2" }, "TablesUsed": [ "main.unsharded" @@ -484,8 +462,7 @@ "Sharded": false }, "FieldQuery": "select u1.a, u2.a from unsharded as u1, unsharded as u2, unsharded as u3 where 1 != 1", - "Query": "select u1.a, u2.a from unsharded as u1, unsharded as u2, unsharded as u3", - "Table": "unsharded" + "Query": "select u1.a, u2.a from unsharded as u1, unsharded as u2, unsharded as u3" }, "TablesUsed": [ "main.unsharded" @@ -507,8 +484,7 @@ "Sharded": false }, "FieldQuery": "select m1.col from unsharded as m1 left join unsharded as m2 on m1.a = m2.b where 1 != 1", - "Query": "select m1.col from unsharded as m1 left join unsharded as m2 on m1.a = m2.b", - "Table": "unsharded" + "Query": "select m1.col from unsharded as m1 left join unsharded as m2 on m1.a = m2.b" }, "TablesUsed": [ "main.unsharded" @@ -529,7 +505,6 @@ "JoinVars": { "u_a": 1 }, - "TableName": "`user`_unsharded", "Inputs": [ { "OperatorType": "Route", @@ -539,8 +514,7 @@ "Sharded": true }, "FieldQuery": "select u.col, u.a from `user` as u where 1 != 1", - "Query": "select u.col, u.a from `user` as u", - "Table": "`user`" + "Query": "select u.col, u.a from `user` as u" }, { "OperatorType": "Route", @@ -550,8 +524,7 @@ "Sharded": false }, "FieldQuery": "select 1 from unsharded as m where 1 != 1", - "Query": "select 1 from unsharded as m where m.b = :u_a", - "Table": "unsharded" + "Query": "select 1 from unsharded as m where m.b = :u_a" } ] }, @@ -575,7 +548,6 @@ "JoinVars": { "m1_col": 1 }, - "TableName": "`user`_unsharded_unsharded", "Inputs": [ { "OperatorType": "Join", @@ -584,7 +556,6 @@ "JoinVars": { "user_col": 0 }, - "TableName": "`user`_unsharded", "Inputs": [ { "OperatorType": "Route", @@ -594,8 +565,7 @@ "Sharded": true }, "FieldQuery": "select `user`.col from `user` where 1 != 1", - "Query": "select `user`.col from `user`", - "Table": "`user`" + "Query": "select `user`.col from `user`" }, { "OperatorType": "Route", @@ -605,8 +575,7 @@ "Sharded": false }, "FieldQuery": "select m1.col from unsharded as m1 where 1 != 1", - "Query": "select m1.col from unsharded as m1 where m1.col = :user_col /* INT16 */", - "Table": "unsharded" + "Query": "select m1.col from unsharded as m1 where m1.col = :user_col /* INT16 */" } ] }, @@ -618,8 +587,7 @@ "Sharded": false }, "FieldQuery": "select m2.foo from unsharded as m2 where 1 != 1", - "Query": "select m2.foo from unsharded as m2 where m2.col = :m1_col", - "Table": "unsharded" + "Query": "select m2.foo from unsharded as m2 where m2.col = :m1_col" } ] }, @@ -643,7 +611,6 @@ "JoinVars": { "user_col": 0 }, - "TableName": "`user`_user_extra_unsharded", "Inputs": [ { "OperatorType": "Route", @@ -653,8 +620,7 @@ "Sharded": true }, "FieldQuery": "select `user`.col from `user` where 1 != 1", - "Query": "select `user`.col from `user`", - "Table": "`user`" + "Query": "select `user`.col from `user`" }, { "OperatorType": "Join", @@ -662,7 +628,6 @@ "JoinVars": { "e_col": 0 }, - "TableName": "user_extra_unsharded", "Inputs": [ { "OperatorType": "Route", @@ -672,8 +637,7 @@ "Sharded": true }, "FieldQuery": "select e.col from user_extra as e where 1 != 1", - "Query": "select e.col from user_extra as e where e.col = :user_col /* INT16 */", - "Table": "user_extra" + "Query": "select e.col from user_extra as e where e.col = :user_col /* INT16 */" }, { "OperatorType": "Route", @@ -683,8 +647,7 @@ "Sharded": false }, "FieldQuery": "select 1 from unsharded as m1 where 1 != 1", - "Query": "select 1 from unsharded as m1 where m1.col = :e_col /* INT16 */", - "Table": "unsharded" + "Query": "select 1 from unsharded as m1 where m1.col = :e_col /* INT16 */" } ] } @@ -712,8 +675,7 @@ "Sharded": false }, "FieldQuery": "select m1.col from unsharded as m1 right join unsharded as m2 on m1.a = m2.b where 1 != 1", - "Query": "select m1.col from unsharded as m1 right join unsharded as m2 on m1.a = m2.b", - "Table": "unsharded" + "Query": "select m1.col from unsharded as m1 right join unsharded as m2 on m1.a = m2.b" }, "TablesUsed": [ "main.unsharded" @@ -735,8 +697,7 @@ "Sharded": false }, "FieldQuery": "select m1.col from unsharded as m1 join unsharded as m2 right join unsharded as m3 on m1.a = m2.b where 1 != 1", - "Query": "select m1.col from unsharded as m1 join unsharded as m2 right join unsharded as m3 on m1.a = m2.b", - "Table": "unsharded" + "Query": "select m1.col from unsharded as m1 join unsharded as m2 right join unsharded as m3 on m1.a = m2.b" }, "TablesUsed": [ "main.unsharded" @@ -769,7 +730,6 @@ "ComparisonType": "FLOAT64", "JoinColumnIndexes": "-1,-2,1,-2,-4,-1", "Predicate": "user_extra.col = um.col", - "TableName": "music_`user`, user_extra_user_metadata", "Inputs": [ { "OperatorType": "Join", @@ -778,7 +738,6 @@ "JoinVars": { "music_intcol": 1 }, - "TableName": "music_`user`, user_extra", "Inputs": [ { "OperatorType": "Route", @@ -788,8 +747,7 @@ "Sharded": true }, "FieldQuery": "select 1, music.intcol from music where 1 != 1 group by music.intcol", - "Query": "select 1, music.intcol from music group by music.intcol", - "Table": "music" + "Query": "select 1, music.intcol from music group by music.intcol" }, { "OperatorType": "Route", @@ -800,7 +758,6 @@ }, "FieldQuery": "select user_extra.col, user_extra.col from `user`, user_extra where 1 != 1 group by user_extra.col", "Query": "select user_extra.col, user_extra.col from `user`, user_extra where `user`.id in (103) and user_extra.col = :music_intcol /* INT16 */ and `user`.id = user_extra.user_id group by user_extra.col", - "Table": "`user`, user_extra", "Values": [ "103" ], @@ -832,8 +789,7 @@ }, "FieldQuery": "select user_metadata.col, count(*) as `count`, weight_string(user_metadata.col) from user_metadata where 1 != 1 group by user_metadata.col, weight_string(user_metadata.col)", "OrderBy": "(0|2) ASC", - "Query": "select user_metadata.col, count(*) as `count`, weight_string(user_metadata.col) from user_metadata group by user_metadata.col, weight_string(user_metadata.col) order by user_metadata.col asc", - "Table": "user_metadata" + "Query": "select user_metadata.col, count(*) as `count`, weight_string(user_metadata.col) from user_metadata group by user_metadata.col, weight_string(user_metadata.col) order by user_metadata.col asc" } ] } @@ -870,8 +826,7 @@ "Sharded": false }, "FieldQuery": "select m1.col from unsharded as m1 straight_join unsharded as m2 where 1 != 1", - "Query": "select m1.col from unsharded as m1 straight_join unsharded as m2", - "Table": "unsharded" + "Query": "select m1.col from unsharded as m1 straight_join unsharded as m2" }, "TablesUsed": [ "main.unsharded" @@ -889,7 +844,6 @@ "OperatorType": "Join", "Variant": "Join", "JoinColumnIndexes": "L:0", - "TableName": "`user`_unsharded", "Inputs": [ { "OperatorType": "Route", @@ -899,8 +853,7 @@ "Sharded": true }, "FieldQuery": "select `user`.col from `user` where 1 != 1", - "Query": "select `user`.col from `user`", - "Table": "`user`" + "Query": "select `user`.col from `user`" }, { "OperatorType": "Route", @@ -910,8 +863,7 @@ "Sharded": false }, "FieldQuery": "select 1 from unsharded as m1, unsharded as m2 where 1 != 1", - "Query": "select 1 from unsharded as m1, unsharded as m2", - "Table": "unsharded" + "Query": "select 1 from unsharded as m1, unsharded as m2" } ] }, @@ -941,7 +893,6 @@ "user_bar": 1, "user_foo": 0 }, - "TableName": "`user`_user_extra", "Inputs": [ { "OperatorType": "Route", @@ -951,8 +902,7 @@ "Sharded": true }, "FieldQuery": "select `user`.foo, `user`.bar from `user` where 1 != 1", - "Query": "select `user`.foo, `user`.bar from `user`", - "Table": "`user`" + "Query": "select `user`.foo, `user`.bar from `user`" }, { "OperatorType": "Route", @@ -962,8 +912,7 @@ "Sharded": true }, "FieldQuery": "select 1 from user_extra where 1 != 1", - "Query": "select 1 from user_extra where user_extra.bar = :user_bar and :user_foo = 42", - "Table": "user_extra" + "Query": "select 1 from user_extra where user_extra.bar = :user_bar and :user_foo = 42" } ] } @@ -986,7 +935,6 @@ "OperatorType": "Join", "Variant": "Join", "JoinColumnIndexes": "L:0", - "TableName": "`user`_unsharded", "Inputs": [ { "OperatorType": "Route", @@ -996,8 +944,7 @@ "Sharded": true }, "FieldQuery": "select `user`.col from `user` where 1 != 1", - "Query": "select `user`.col from `user`", - "Table": "`user`" + "Query": "select `user`.col from `user`" }, { "OperatorType": "Route", @@ -1007,8 +954,7 @@ "Sharded": false }, "FieldQuery": "select 1 from unsharded as m1, unsharded as m2 where 1 != 1", - "Query": "select 1 from unsharded as m1, unsharded as m2", - "Table": "unsharded" + "Query": "select 1 from unsharded as m1, unsharded as m2" } ] }, @@ -1029,7 +975,6 @@ "OperatorType": "Join", "Variant": "Join", "JoinColumnIndexes": "R:0", - "TableName": "`user`_`user`_unsharded", "Inputs": [ { "OperatorType": "Route", @@ -1039,14 +984,12 @@ "Sharded": true }, "FieldQuery": "select 1 from `user` as u1 where 1 != 1", - "Query": "select 1 from `user` as u1", - "Table": "`user`" + "Query": "select 1 from `user` as u1" }, { "OperatorType": "Join", "Variant": "Join", "JoinColumnIndexes": "L:0", - "TableName": "`user`_unsharded", "Inputs": [ { "OperatorType": "Route", @@ -1056,8 +999,7 @@ "Sharded": true }, "FieldQuery": "select `user`.col from `user` where 1 != 1", - "Query": "select `user`.col from `user`", - "Table": "`user`" + "Query": "select `user`.col from `user`" }, { "OperatorType": "Route", @@ -1067,8 +1009,7 @@ "Sharded": false }, "FieldQuery": "select 1 from unsharded where 1 != 1", - "Query": "select 1 from unsharded", - "Table": "unsharded" + "Query": "select 1 from unsharded" } ] } @@ -1095,8 +1036,7 @@ "Sharded": true }, "FieldQuery": "select `user`.col from `user` use index (a) where 1 != 1", - "Query": "select `user`.col from `user` use index (a)", - "Table": "`user`" + "Query": "select `user`.col from `user` use index (a)" }, "TablesUsed": [ "user.user" @@ -1118,8 +1058,7 @@ "Sharded": true }, "FieldQuery": "select `user`.col from `user` use index (a) use index for group by (b) where 1 != 1", - "Query": "select `user`.col from `user` use index (a) use index for group by (b)", - "Table": "`user`" + "Query": "select `user`.col from `user` use index (a) use index for group by (b)" }, "TablesUsed": [ "user.user" @@ -1145,7 +1084,6 @@ "JoinVars": { "ue_x": 0 }, - "TableName": "dual_`user`", "Inputs": [ { "OperatorType": "Route", @@ -1155,8 +1093,7 @@ "Sharded": false }, "FieldQuery": "select ue.x from (select 1 as x from dual where 1 != 1) as ue where 1 != 1", - "Query": "select ue.x from (select 1 as x from dual) as ue", - "Table": "dual" + "Query": "select ue.x from (select 1 as x from dual) as ue" }, { "OperatorType": "Route", @@ -1167,7 +1104,6 @@ }, "FieldQuery": "select 1 from `user` as u where 1 != 1", "Query": "select 1 from `user` as u where u.id = :ue_x /* INT64 */", - "Table": "`user`", "Values": [ ":ue_x" ], @@ -1198,8 +1134,7 @@ "Sharded": true }, "FieldQuery": "select `user`.col from `user`, user_extra where 1 != 1", - "Query": "select `user`.col from `user`, user_extra where `user`.id = user_extra.user_id", - "Table": "`user`, user_extra" + "Query": "select `user`.col from `user`, user_extra where `user`.id = user_extra.user_id" }, "TablesUsed": [ "user.user", @@ -1222,8 +1157,7 @@ "Sharded": true }, "FieldQuery": "select `user`.col from `user`, user_extra where 1 != 1", - "Query": "select `user`.col from `user`, user_extra where `user`.id = user_extra.user_id", - "Table": "`user`, user_extra" + "Query": "select `user`.col from `user`, user_extra where `user`.id = user_extra.user_id" }, "TablesUsed": [ "user.user", @@ -1246,8 +1180,7 @@ "Sharded": true }, "FieldQuery": "select `user`.col from `user`, user_extra where 1 != 1", - "Query": "select `user`.col from `user`, user_extra where `user`.col between 1 and 2 and `user`.id = user_extra.user_id", - "Table": "`user`, user_extra" + "Query": "select `user`.col from `user`, user_extra where `user`.col between 1 and 2 and `user`.id = user_extra.user_id" }, "TablesUsed": [ "user.user", @@ -1270,8 +1203,7 @@ "Sharded": true }, "FieldQuery": "select `user`.col from `user`, user_extra where 1 != 1", - "Query": "select `user`.col from `user`, user_extra where user_extra.user_id = `user`.id", - "Table": "`user`, user_extra" + "Query": "select `user`.col from `user`, user_extra where user_extra.user_id = `user`.id" }, "TablesUsed": [ "user.user", @@ -1295,7 +1227,6 @@ }, "FieldQuery": "select `user`.col from `user`, user_extra where 1 != 1", "Query": "select `user`.col from `user`, user_extra where `user`.id = 5 and `user`.id = user_extra.user_id", - "Table": "`user`, user_extra", "Values": [ "5" ], @@ -1321,7 +1252,6 @@ "JoinVars": { "user_id": 1 }, - "TableName": "`user`_user_extra", "Inputs": [ { "OperatorType": "Route", @@ -1331,8 +1261,7 @@ "Sharded": true }, "FieldQuery": "select `user`.col, `user`.id from `user` where 1 != 1", - "Query": "select `user`.col, `user`.id from `user`", - "Table": "`user`" + "Query": "select `user`.col, `user`.id from `user`" }, { "OperatorType": "Route", @@ -1342,8 +1271,7 @@ "Sharded": true }, "FieldQuery": "select 1 from user_extra where 1 != 1", - "Query": "select 1 from user_extra where :user_id < user_extra.user_id", - "Table": "user_extra" + "Query": "select 1 from user_extra where :user_id < user_extra.user_id" } ] }, @@ -1364,7 +1292,6 @@ "OperatorType": "Join", "Variant": "Join", "JoinColumnIndexes": "L:0", - "TableName": "`user`_user_extra", "Inputs": [ { "OperatorType": "Route", @@ -1375,7 +1302,6 @@ }, "FieldQuery": "select `user`.col from `user` where 1 != 1", "Query": "select `user`.col from `user` where `user`.id = 5", - "Table": "`user`", "Values": [ "5" ], @@ -1389,8 +1315,7 @@ "Sharded": true }, "FieldQuery": "select 1 from user_extra where 1 != 1", - "Query": "select 1 from user_extra", - "Table": "user_extra" + "Query": "select 1 from user_extra" } ] }, @@ -1411,7 +1336,6 @@ "OperatorType": "Join", "Variant": "Join", "JoinColumnIndexes": "L:0", - "TableName": "`user`_user_extra", "Inputs": [ { "OperatorType": "Route", @@ -1422,7 +1346,6 @@ }, "FieldQuery": "select `user`.col from `user` where 1 != 1", "Query": "select `user`.col from `user` where `user`.id = 5", - "Table": "`user`", "Values": [ "5" ], @@ -1436,8 +1359,7 @@ "Sharded": true }, "FieldQuery": "select 1 from user_extra where 1 != 1", - "Query": "select 1 from user_extra", - "Table": "user_extra" + "Query": "select 1 from user_extra" } ] }, @@ -1461,7 +1383,6 @@ "JoinVars": { "user_extra_col": 0 }, - "TableName": "user_extra_`user`", "Inputs": [ { "OperatorType": "Route", @@ -1471,8 +1392,7 @@ "Sharded": true }, "FieldQuery": "select user_extra.col from user_extra where 1 != 1", - "Query": "select user_extra.col from user_extra", - "Table": "user_extra" + "Query": "select user_extra.col from user_extra" }, { "OperatorType": "Route", @@ -1483,7 +1403,6 @@ }, "FieldQuery": "select `user`.col from `user` where 1 != 1", "Query": "select `user`.col from `user` where `user`.id = :user_extra_col /* INT16 */", - "Table": "`user`", "Values": [ ":user_extra_col" ], @@ -1511,7 +1430,6 @@ "JoinVars": { "user_name": 1 }, - "TableName": "`user`_user_extra", "Inputs": [ { "OperatorType": "Route", @@ -1521,8 +1439,7 @@ "Sharded": true }, "FieldQuery": "select `user`.col, `user`.`name` from `user` where 1 != 1", - "Query": "select `user`.col, `user`.`name` from `user`", - "Table": "`user`" + "Query": "select `user`.col, `user`.`name` from `user`" }, { "OperatorType": "Route", @@ -1533,7 +1450,6 @@ }, "FieldQuery": "select 1 from user_extra where 1 != 1", "Query": "select 1 from user_extra where user_extra.user_id = :user_name", - "Table": "user_extra", "Values": [ ":user_name" ], @@ -1562,8 +1478,7 @@ "Sharded": true }, "FieldQuery": "select `user`.col from `user`, ref where 1 != 1", - "Query": "select `user`.col from `user`, ref", - "Table": "`user`, ref" + "Query": "select `user`.col from `user`, ref" }, "TablesUsed": [ "user.ref", @@ -1586,8 +1501,7 @@ "Sharded": true }, "FieldQuery": "select r1.col from ref as r1, ref where 1 != 1", - "Query": "select r1.col from ref as r1, ref", - "Table": "ref" + "Query": "select r1.col from ref as r1, ref" }, "TablesUsed": [ "user.ref" @@ -1609,8 +1523,7 @@ "Sharded": true }, "FieldQuery": "select ref.col from ref, `user` where 1 != 1", - "Query": "select ref.col from ref, `user`", - "Table": "`user`, ref" + "Query": "select ref.col from ref, `user`" }, "TablesUsed": [ "user.ref", @@ -1634,7 +1547,6 @@ }, "FieldQuery": "select ref.col from (select aa from `user` where 1 != 1) as `user`, ref where 1 != 1", "Query": "select ref.col from (select aa from `user` where `user`.id = 1) as `user`, ref", - "Table": "`user`, ref", "Values": [ "1" ], @@ -1657,7 +1569,6 @@ "OperatorType": "Join", "Variant": "Join", "JoinColumnIndexes": "L:0", - "TableName": "unsharded_user_extra", "Inputs": [ { "OperatorType": "Route", @@ -1667,8 +1578,7 @@ "Sharded": false }, "FieldQuery": "select route2.col from unsharded as route2 where 1 != 1", - "Query": "select route2.col from unsharded as route2", - "Table": "unsharded" + "Query": "select route2.col from unsharded as route2" }, { "OperatorType": "Route", @@ -1678,8 +1588,7 @@ "Sharded": true }, "FieldQuery": "select 1 from user_extra where 1 != 1", - "Query": "select 1 from user_extra", - "Table": "user_extra" + "Query": "select 1 from user_extra" } ] }, @@ -1705,7 +1614,6 @@ }, "FieldQuery": "select id from (select id, col from `user` where 1 != 1) as t where 1 != 1", "Query": "select id from (select id, col from `user` where id = 5) as t", - "Table": "`user`", "Values": [ "5" ], @@ -1732,7 +1640,6 @@ }, "FieldQuery": "select t.id from (select id from `user` where 1 != 1) as t, user_extra where 1 != 1", "Query": "select t.id from (select id from `user` where id = 5) as t, user_extra where t.id = user_extra.user_id", - "Table": "`user`, user_extra", "Values": [ "5" ], @@ -1760,7 +1667,6 @@ }, "FieldQuery": "select t.id from (select `user`.id from `user` where 1 != 1) as t, user_extra where 1 != 1", "Query": "select t.id from (select `user`.id from `user` where `user`.id = 5) as t, user_extra where t.id = user_extra.user_id", - "Table": "`user`, user_extra", "Values": [ "5" ], @@ -1793,7 +1699,6 @@ }, "FieldQuery": "select t.id from (select id from `user` where 1 != 1) as t, user_extra where 1 != 1", "Query": "select t.id from (select id from `user` where id = 5) as t, user_extra where t.id = user_extra.user_id", - "Table": "`user`, user_extra", "Values": [ "5" ], @@ -1819,7 +1724,6 @@ "JoinVars": { "t_id": 0 }, - "TableName": "`user`_user_extra", "Inputs": [ { "OperatorType": "Route", @@ -1830,7 +1734,6 @@ }, "FieldQuery": "select t.id from (select id from `user` where 1 != 1) as t where 1 != 1", "Query": "select t.id from (select id from `user` where id = 5) as t", - "Table": "`user`", "Values": [ "5" ], @@ -1844,8 +1747,7 @@ "Sharded": true }, "FieldQuery": "select 1 from user_extra where 1 != 1", - "Query": "select 1 from user_extra where user_extra.col = :t_id", - "Table": "user_extra" + "Query": "select 1 from user_extra where user_extra.col = :t_id" } ] }, @@ -1871,7 +1773,6 @@ }, "FieldQuery": "select id from (select id, col from `user` as route1 where 1 != 1) as t where 1 != 1", "Query": "select id from (select id, col from `user` as route1 where id = 5) as t", - "Table": "`user`", "Values": [ "5" ], @@ -1903,7 +1804,6 @@ }, "FieldQuery": "select id from (select id, col from `user` as route1 where 1 != 1) as t where 1 != 1", "Query": "select id from (select id, col from `user` as route1 where id = 5) as t", - "Table": "`user`", "Values": [ "5" ], @@ -1934,8 +1834,7 @@ "Sharded": true }, "FieldQuery": "select t.id from (select id, textcol1 as baz from `user` as route1 where 1 != 1) as t, (select id, textcol1 + textcol1 as baz from `user` where 1 != 1) as s where 1 != 1", - "Query": "select t.id from (select id, textcol1 as baz from `user` as route1 where textcol1 = '3') as t, (select id, textcol1 + textcol1 as baz from `user` where textcol1 + textcol1 = '3') as s where t.id = s.id", - "Table": "`user`" + "Query": "select t.id from (select id, textcol1 as baz from `user` as route1 where textcol1 = '3') as t, (select id, textcol1 + textcol1 as baz from `user` where textcol1 + textcol1 = '3') as s where t.id = s.id" }, "TablesUsed": [ "user.user" @@ -1957,8 +1856,7 @@ "Sharded": true }, "FieldQuery": "select bar from (select foo + 4 as bar from (select colA + colB as foo from `user` where 1 != 1) as u where 1 != 1) as t where 1 != 1", - "Query": "select bar from (select foo + 4 as bar from (select colA + colB as foo from `user` where colA + colB + 4 = 5) as u) as t", - "Table": "`user`" + "Query": "select bar from (select foo + 4 as bar from (select colA + colB as foo from `user` where colA + colB + 4 = 5) as u) as t" }, "TablesUsed": [ "user.user" @@ -1981,7 +1879,6 @@ }, "FieldQuery": "select id from (select id from (select id from `user` where 1 != 1) as u where 1 != 1) as t where 1 != 1", "Query": "select id from (select id from (select id from `user` where id = 5) as u) as t", - "Table": "`user`", "Values": [ "5" ], @@ -2008,7 +1905,6 @@ }, "FieldQuery": "select u.col, e.col from (select col from `user` where 1 != 1) as u, (select col from user_extra where 1 != 1) as e where 1 != 1", "Query": "select u.col, e.col from (select col from `user` where id = 5) as u, (select col from user_extra where user_id = 5) as e", - "Table": "`user`, user_extra", "Values": [ "5" ], @@ -2031,7 +1927,6 @@ "OperatorType": "Join", "Variant": "Join", "JoinColumnIndexes": "L:0,R:0", - "TableName": "`user`_`user`", "Inputs": [ { "OperatorType": "Route", @@ -2041,8 +1936,7 @@ "Sharded": true }, "FieldQuery": "select dt1.id from (select id from `user` where 1 != 1) as dt1 where 1 != 1", - "Query": "select dt1.id from (select id from `user`) as dt1", - "Table": "`user`" + "Query": "select dt1.id from (select id from `user`) as dt1" }, { "OperatorType": "Route", @@ -2052,8 +1946,7 @@ "Sharded": true }, "FieldQuery": "select dt2.id from (select id from `user` where 1 != 1) as dt2 where 1 != 1", - "Query": "select dt2.id from (select id from `user`) as dt2", - "Table": "`user`" + "Query": "select dt2.id from (select id from `user`) as dt2" } ] }, @@ -2073,7 +1966,6 @@ "OperatorType": "Join", "Variant": "Join", "JoinColumnIndexes": "R:0", - "TableName": "information_schema.CHARACTER_SETS_unsharded", "Inputs": [ { "OperatorType": "Route", @@ -2083,8 +1975,7 @@ "Sharded": false }, "FieldQuery": "select 1 from information_schema.CHARACTER_SETS where 1 != 1", - "Query": "select 1 from information_schema.CHARACTER_SETS", - "Table": "information_schema.CHARACTER_SETS" + "Query": "select 1 from information_schema.CHARACTER_SETS" }, { "OperatorType": "Route", @@ -2094,8 +1985,7 @@ "Sharded": false }, "FieldQuery": "select unsharded.foo from unsharded where 1 != 1", - "Query": "select unsharded.foo from unsharded", - "Table": "unsharded" + "Query": "select unsharded.foo from unsharded" } ] }, @@ -2119,8 +2009,7 @@ "Sharded": true }, "FieldQuery": "select 42 from `user` as u, user_extra as ue, music as m where 1 != 1", - "Query": "select 42 from `user` as u, user_extra as ue, music as m where u.id = ue.user_id and m.user_id = u.id and (u.foo or m.foo or ue.foo)", - "Table": "`user`, music, user_extra" + "Query": "select 42 from `user` as u, user_extra as ue, music as m where u.id = ue.user_id and m.user_id = u.id and (u.foo or m.foo or ue.foo)" }, "TablesUsed": [ "user.music", @@ -2140,7 +2029,6 @@ "OperatorType": "Join", "Variant": "Join", "JoinColumnIndexes": "L:0", - "TableName": "unsharded_information_schema.CHARACTER_SETS", "Inputs": [ { "OperatorType": "Route", @@ -2150,8 +2038,7 @@ "Sharded": false }, "FieldQuery": "select unsharded.foo from unsharded where 1 != 1", - "Query": "select unsharded.foo from unsharded", - "Table": "unsharded" + "Query": "select unsharded.foo from unsharded" }, { "OperatorType": "Route", @@ -2161,8 +2048,7 @@ "Sharded": false }, "FieldQuery": "select 1 from information_schema.CHARACTER_SETS where 1 != 1", - "Query": "select 1 from information_schema.CHARACTER_SETS", - "Table": "information_schema.CHARACTER_SETS" + "Query": "select 1 from information_schema.CHARACTER_SETS" } ] }, @@ -2186,13 +2072,11 @@ "t_col1": 0, "t_id": 1 }, - "TableName": "`user`_user_extra_unsharded", "Inputs": [ { "OperatorType": "Join", "Variant": "Join", "JoinColumnIndexes": "L:1,L:0", - "TableName": "`user`_user_extra", "Inputs": [ { "OperatorType": "Route", @@ -2202,8 +2086,7 @@ "Sharded": true }, "FieldQuery": "select t.id, t.col1 from (select `user`.id, `user`.col1 from `user` where 1 != 1) as t where 1 != 1", - "Query": "select t.id, t.col1 from (select `user`.id, `user`.col1 from `user`) as t", - "Table": "`user`" + "Query": "select t.id, t.col1 from (select `user`.id, `user`.col1 from `user`) as t" }, { "OperatorType": "Route", @@ -2213,8 +2096,7 @@ "Sharded": true }, "FieldQuery": "select 1 from user_extra where 1 != 1", - "Query": "select 1 from user_extra", - "Table": "user_extra" + "Query": "select 1 from user_extra" } ] }, @@ -2226,8 +2108,7 @@ "Sharded": false }, "FieldQuery": "select 1 from unsharded where 1 != 1", - "Query": "select 1 from unsharded where unsharded.id = :t_id and unsharded.col1 = :t_col1", - "Table": "unsharded" + "Query": "select 1 from unsharded where unsharded.id = :t_id and unsharded.col1 = :t_col1" } ] }, @@ -2252,7 +2133,6 @@ "JoinVars": { "user_col": 2 }, - "TableName": "`user`_user_extra", "Inputs": [ { "OperatorType": "Route", @@ -2262,8 +2142,7 @@ "Sharded": true }, "FieldQuery": "select t.id, t.col1, t.`user.col` from (select `user`.id, `user`.col1, `user`.col as `user.col` from `user` where 1 != 1) as t where 1 != 1", - "Query": "select t.id, t.col1, t.`user.col` from (select `user`.id, `user`.col1, `user`.col as `user.col` from `user`) as t", - "Table": "`user`" + "Query": "select t.id, t.col1, t.`user.col` from (select `user`.id, `user`.col1, `user`.col as `user.col` from `user`) as t" }, { "OperatorType": "Route", @@ -2273,8 +2152,7 @@ "Sharded": true }, "FieldQuery": "select 1 from user_extra where 1 != 1", - "Query": "select 1 from user_extra where user_extra.col = :user_col /* INT16 */", - "Table": "user_extra" + "Query": "select 1 from user_extra where user_extra.col = :user_col /* INT16 */" } ] }, @@ -2295,7 +2173,6 @@ "OperatorType": "Join", "Variant": "Join", "JoinColumnIndexes": "R:0", - "TableName": "unsharded_a_`user`_user_extra", "Inputs": [ { "OperatorType": "Route", @@ -2305,14 +2182,12 @@ "Sharded": false }, "FieldQuery": "select 1 from unsharded_a as ua where 1 != 1", - "Query": "select 1 from unsharded_a as ua", - "Table": "unsharded_a" + "Query": "select 1 from unsharded_a as ua" }, { "OperatorType": "Join", "Variant": "Join", "JoinColumnIndexes": "L:1", - "TableName": "`user`_user_extra", "Inputs": [ { "OperatorType": "Route", @@ -2322,8 +2197,7 @@ "Sharded": true }, "FieldQuery": "select t.id, t.col1 from (select `user`.id, `user`.col1 from `user` where 1 != 1) as t where 1 != 1", - "Query": "select t.id, t.col1 from (select `user`.id, `user`.col1 from `user`) as t", - "Table": "`user`" + "Query": "select t.id, t.col1 from (select `user`.id, `user`.col1 from `user`) as t" }, { "OperatorType": "Route", @@ -2333,8 +2207,7 @@ "Sharded": true }, "FieldQuery": "select 1 from user_extra where 1 != 1", - "Query": "select 1 from user_extra", - "Table": "user_extra" + "Query": "select 1 from user_extra" } ] } @@ -2361,7 +2234,6 @@ "JoinVars": { "ua_id": 0 }, - "TableName": "unsharded_a_`user`_user_extra", "Inputs": [ { "OperatorType": "Route", @@ -2371,14 +2243,12 @@ "Sharded": false }, "FieldQuery": "select ua.id from unsharded_a as ua where 1 != 1", - "Query": "select ua.id from unsharded_a as ua", - "Table": "unsharded_a" + "Query": "select ua.id from unsharded_a as ua" }, { "OperatorType": "Join", "Variant": "Join", "JoinColumnIndexes": "L:1", - "TableName": "`user`_user_extra", "Inputs": [ { "OperatorType": "Route", @@ -2389,7 +2259,6 @@ }, "FieldQuery": "select t.id, t.col1 from (select `user`.id, `user`.col1 from `user` where 1 != 1) as t where 1 != 1", "Query": "select t.id, t.col1 from (select `user`.id, `user`.col1 from `user` where `user`.id = :ua_id) as t", - "Table": "`user`", "Values": [ ":ua_id" ], @@ -2403,8 +2272,7 @@ "Sharded": true }, "FieldQuery": "select 1 from user_extra where 1 != 1", - "Query": "select 1 from user_extra", - "Table": "user_extra" + "Query": "select 1 from user_extra" } ] } @@ -2440,8 +2308,7 @@ "Sharded": true }, "FieldQuery": "select col from `user` where 1 != 1", - "Query": "select col from `user`", - "Table": "`user`" + "Query": "select col from `user`" }, { "InputName": "Outer", @@ -2452,8 +2319,7 @@ "Sharded": false }, "FieldQuery": "select unsharded_a.col from unsharded_a, unsharded_b where 1 != 1", - "Query": "select unsharded_a.col from unsharded_a, unsharded_b where :__sq1", - "Table": "unsharded_a, unsharded_b" + "Query": "select unsharded_a.col from unsharded_a, unsharded_b where :__sq1" } ] }, @@ -2487,8 +2353,7 @@ "Sharded": true }, "FieldQuery": "select col from `user` where 1 != 1", - "Query": "select col from `user`", - "Table": "`user`" + "Query": "select col from `user`" }, { "InputName": "Outer", @@ -2499,8 +2364,7 @@ "Sharded": false }, "FieldQuery": "select unsharded_a.col from unsharded_a, unsharded_b where 1 != 1", - "Query": "select unsharded_a.col from unsharded_a, unsharded_b where unsharded_a.col + :__sq1", - "Table": "unsharded_a, unsharded_b" + "Query": "select unsharded_a.col from unsharded_a, unsharded_b where unsharded_a.col + :__sq1" } ] }, @@ -2535,8 +2399,7 @@ "Sharded": true }, "FieldQuery": "select col from `user` where 1 != 1", - "Query": "select col from `user`", - "Table": "`user`" + "Query": "select col from `user`" }, { "InputName": "Outer", @@ -2547,8 +2410,7 @@ "Sharded": false }, "FieldQuery": "select unsharded_a.col from unsharded_a, unsharded_b where 1 != 1", - "Query": "select unsharded_a.col from unsharded_a, unsharded_b where :__sq_has_values and unsharded_a.col in ::__sq1", - "Table": "unsharded_a, unsharded_b" + "Query": "select unsharded_a.col from unsharded_a, unsharded_b where :__sq_has_values and unsharded_a.col in ::__sq1" } ] }, @@ -2583,8 +2445,7 @@ "Sharded": true }, "FieldQuery": "select col from `user` where 1 != 1", - "Query": "select col from `user`", - "Table": "`user`" + "Query": "select col from `user`" }, { "InputName": "Outer", @@ -2596,7 +2457,6 @@ "OperatorType": "Join", "Variant": "Join", "JoinColumnIndexes": "L:0,R:0", - "TableName": "unsharded_`user`", "Inputs": [ { "OperatorType": "Route", @@ -2606,8 +2466,7 @@ "Sharded": false }, "FieldQuery": "select unsharded.col from unsharded where 1 != 1", - "Query": "select unsharded.col from unsharded", - "Table": "unsharded" + "Query": "select unsharded.col from unsharded" }, { "OperatorType": "Route", @@ -2617,8 +2476,7 @@ "Sharded": true }, "FieldQuery": "select `user`.col from `user` where 1 != 1", - "Query": "select `user`.col from `user`", - "Table": "`user`" + "Query": "select `user`.col from `user`" } ] } @@ -2643,7 +2501,6 @@ "OperatorType": "Join", "Variant": "Join", "JoinColumnIndexes": "L:0", - "TableName": "unsharded_`user`_unsharded_a", "Inputs": [ { "OperatorType": "UncorrelatedSubquery", @@ -2662,8 +2519,7 @@ "Sharded": true }, "FieldQuery": "select col from `user` where 1 != 1", - "Query": "select col from `user`", - "Table": "`user`" + "Query": "select col from `user`" }, { "InputName": "Outer", @@ -2674,7 +2530,6 @@ "OperatorType": "Join", "Variant": "Join", "JoinColumnIndexes": "L:0,R:0", - "TableName": "unsharded_`user`", "Inputs": [ { "OperatorType": "Route", @@ -2684,8 +2539,7 @@ "Sharded": false }, "FieldQuery": "select unsharded.col from unsharded where 1 != 1", - "Query": "select unsharded.col from unsharded", - "Table": "unsharded" + "Query": "select unsharded.col from unsharded" }, { "OperatorType": "Route", @@ -2695,8 +2549,7 @@ "Sharded": true }, "FieldQuery": "select `user`.col from `user` where 1 != 1", - "Query": "select `user`.col from `user`", - "Table": "`user`" + "Query": "select `user`.col from `user`" } ] } @@ -2712,8 +2565,7 @@ "Sharded": false }, "FieldQuery": "select 1 from unsharded_a where 1 != 1", - "Query": "select 1 from unsharded_a", - "Table": "unsharded_a" + "Query": "select 1 from unsharded_a" } ] }, @@ -2738,7 +2590,6 @@ "JoinVars": { "user_col2": 1 }, - "TableName": "`user`_unsharded", "Inputs": [ { "OperatorType": "Route", @@ -2748,8 +2599,7 @@ "Sharded": true }, "FieldQuery": "select `user`.col1, `user`.col2 from `user` where 1 != 1", - "Query": "select `user`.col1, `user`.col2 from `user`", - "Table": "`user`" + "Query": "select `user`.col1, `user`.col2 from `user`" }, { "OperatorType": "Route", @@ -2759,8 +2609,7 @@ "Sharded": false }, "FieldQuery": "select unsharded.col1 from unsharded where 1 != 1", - "Query": "select unsharded.col1 from unsharded where unsharded.col2 = :user_col2", - "Table": "unsharded" + "Query": "select unsharded.col1 from unsharded where unsharded.col2 = :user_col2" } ] }, @@ -2785,8 +2634,7 @@ "Sharded": false }, "FieldQuery": "select foo.col from foo where 1 != 1", - "Query": "select foo.col from foo", - "Table": "foo" + "Query": "select foo.col from foo" }, "TablesUsed": [ "main.foo" @@ -2808,8 +2656,7 @@ "Sharded": true }, "FieldQuery": "select `user`.col from `user`, user_extra where 1 != 1", - "Query": "select `user`.col from `user`, user_extra where `user`.ID = user_extra.User_Id", - "Table": "`user`, user_extra" + "Query": "select `user`.col from `user`, user_extra where `user`.ID = user_extra.User_Id" }, "TablesUsed": [ "user.user", @@ -2828,7 +2675,6 @@ "OperatorType": "Join", "Variant": "Join", "JoinColumnIndexes": "L:0,L:0", - "TableName": "`user`_user_extra", "Inputs": [ { "OperatorType": "Route", @@ -2838,8 +2684,7 @@ "Sharded": true }, "FieldQuery": "select t.id from (select `user`.id from `user` where 1 != 1) as t where 1 != 1", - "Query": "select t.id from (select `user`.id from `user`) as t", - "Table": "`user`" + "Query": "select t.id from (select `user`.id from `user`) as t" }, { "OperatorType": "Route", @@ -2849,8 +2694,7 @@ "Sharded": true }, "FieldQuery": "select 1 from user_extra where 1 != 1", - "Query": "select 1 from user_extra", - "Table": "user_extra" + "Query": "select 1 from user_extra" } ] }, @@ -2875,8 +2719,7 @@ "Sharded": false }, "FieldQuery": "select u1.a from unsharded as u1 join unsharded as u2 on database() where 1 != 1", - "Query": "select u1.a from unsharded as u1 join unsharded as u2 on database()", - "Table": "unsharded" + "Query": "select u1.a from unsharded as u1 join unsharded as u2 on database()" }, "TablesUsed": [ "main.unsharded" @@ -2921,8 +2764,7 @@ "Sharded": true }, "FieldQuery": "select :__lastInsertId as `last_insert_id()` from `user` where 1 != 1", - "Query": "select :__lastInsertId as `last_insert_id()` from `user`", - "Table": "`user`" + "Query": "select :__lastInsertId as `last_insert_id()` from `user`" }, "TablesUsed": [ "user.user" @@ -2944,8 +2786,7 @@ "Sharded": false }, "FieldQuery": "select :__lastInsertId as `last_insert_id()` from unsharded where 1 != 1", - "Query": "select :__lastInsertId as `last_insert_id()` from unsharded", - "Table": "unsharded" + "Query": "select :__lastInsertId as `last_insert_id()` from unsharded" }, "TablesUsed": [ "main.unsharded" @@ -2966,7 +2807,6 @@ "JoinVars": { "user_extra_assembly_id": 0 }, - "TableName": "user_extra_`user`", "Inputs": [ { "OperatorType": "Route", @@ -2977,7 +2817,6 @@ }, "FieldQuery": "select user_extra.assembly_id from user_extra where 1 != 1", "Query": "select user_extra.assembly_id from user_extra where user_extra.user_id = 2", - "Table": "user_extra", "Values": [ "2" ], @@ -2992,7 +2831,6 @@ }, "FieldQuery": "select `user`.id from `user` where 1 != 1", "Query": "select `user`.id from `user` where `user`.id = :user_extra_assembly_id", - "Table": "`user`", "Values": [ ":user_extra_assembly_id" ], @@ -3021,8 +2859,7 @@ "Sharded": false }, "FieldQuery": "select u1.a from unsharded as u1, unsharded as u2 join unsharded as u3 on u1.a = u2.a where 1 != 1", - "Query": "select u1.a from unsharded as u1, unsharded as u2 join unsharded as u3 on u1.a = u2.a", - "Table": "unsharded" + "Query": "select u1.a from unsharded as u1, unsharded as u2 join unsharded as u3 on u1.a = u2.a" }, "TablesUsed": [ "main.unsharded" @@ -3049,8 +2886,7 @@ "Sharded": false }, "FieldQuery": "select unsharded.id from unsharded where 1 != 1", - "Query": "select unsharded.id from unsharded where Unsharded.val = 1", - "Table": "unsharded" + "Query": "select unsharded.id from unsharded where Unsharded.val = 1" }, "TablesUsed": [ "main.unsharded" @@ -3102,8 +2938,7 @@ "Sharded": false }, "FieldQuery": "select m1.col from (unsharded as m1, unsharded as m2) where 1 != 1", - "Query": "select m1.col from (unsharded as m1, unsharded as m2)", - "Table": "unsharded" + "Query": "select m1.col from (unsharded as m1, unsharded as m2)" }, "TablesUsed": [ "main.unsharded" @@ -3124,7 +2959,6 @@ "JoinVars": { "ue_id": 1 }, - "TableName": "music, user_extra_`user`", "Inputs": [ { "OperatorType": "Route", @@ -3134,8 +2968,7 @@ "Sharded": true }, "FieldQuery": "select 1, ue.id from user_extra as ue, music as m where 1 != 1", - "Query": "select 1, ue.id from user_extra as ue, music as m where m.user_id = ue.user_id", - "Table": "music, user_extra" + "Query": "select 1, ue.id from user_extra as ue, music as m where m.user_id = ue.user_id" }, { "OperatorType": "Route", @@ -3146,7 +2979,6 @@ }, "FieldQuery": "select 1 from `user` as u where 1 != 1", "Query": "select 1 from `user` as u where u.id = :ue_id", - "Table": "`user`", "Values": [ ":ue_id" ], @@ -3175,7 +3007,6 @@ "JoinVars": { "ue_id": 0 }, - "TableName": "user_extra_`user`", "Inputs": [ { "OperatorType": "Route", @@ -3185,8 +3016,7 @@ "Sharded": true }, "FieldQuery": "select ue.id as ueid from user_extra as ue where 1 != 1", - "Query": "select ue.id as ueid from user_extra as ue", - "Table": "user_extra" + "Query": "select ue.id as ueid from user_extra as ue" }, { "OperatorType": "Route", @@ -3197,7 +3027,6 @@ }, "FieldQuery": "select u.id as uid from `user` as u where 1 != 1", "Query": "select u.id as uid from `user` as u where u.id = :ue_id", - "Table": "`user`", "Values": [ ":ue_id" ], @@ -3224,7 +3053,6 @@ "ComparisonType": "-1", "JoinColumnIndexes": "-1", "Predicate": "u.id = ue.user_id", - "TableName": "`user`_user_extra", "Inputs": [ { "OperatorType": "Limit", @@ -3238,8 +3066,7 @@ "Sharded": true }, "FieldQuery": "select u.id from (select id from `user` where 1 != 1) as u where 1 != 1", - "Query": "select u.id from (select id from `user`) as u limit 10", - "Table": "`user`" + "Query": "select u.id from (select id from `user`) as u limit 10" } ] }, @@ -3255,8 +3082,7 @@ "Sharded": true }, "FieldQuery": "select ue.user_id from (select user_id from user_extra where 1 != 1) as ue where 1 != 1", - "Query": "select ue.user_id from (select user_id from user_extra) as ue limit 10", - "Table": "user_extra" + "Query": "select ue.user_id from (select user_id from user_extra) as ue limit 10" } ] } @@ -3294,8 +3120,7 @@ "Sharded": true }, "FieldQuery": "select count(*) as a from `user` where 1 != 1", - "Query": "select count(*) as a from `user`", - "Table": "`user`" + "Query": "select count(*) as a from `user`" } ] } @@ -3321,8 +3146,7 @@ "Sharded": false }, "FieldQuery": "select u.* from (select * from unsharded where 1 != 1) as u where 1 != 1", - "Query": "select u.* from (select * from unsharded) as u", - "Table": "unsharded" + "Query": "select u.* from (select * from unsharded) as u" }, "TablesUsed": [ "main.unsharded" @@ -3340,7 +3164,6 @@ "OperatorType": "Join", "Variant": "Join", "JoinColumnIndexes": "L:0", - "TableName": "`user`_user_extra", "Inputs": [ { "OperatorType": "Route", @@ -3351,7 +3174,6 @@ }, "FieldQuery": "select t.id, t.col from (select `user`.id, `user`.col from `user` where 1 != 1) as t where 1 != 1", "Query": "select t.id, t.col from (select `user`.id, `user`.col from `user` where `user`.id = 5) as t", - "Table": "`user`", "Values": [ "5" ], @@ -3365,8 +3187,7 @@ "Sharded": true }, "FieldQuery": "select 1 from user_extra where 1 != 1", - "Query": "select 1 from user_extra", - "Table": "user_extra" + "Query": "select 1 from user_extra" } ] }, @@ -3387,7 +3208,6 @@ "OperatorType": "Join", "Variant": "Join", "JoinColumnIndexes": "L:0", - "TableName": "`user`_user_extra", "Inputs": [ { "OperatorType": "Route", @@ -3397,8 +3217,7 @@ "Sharded": true }, "FieldQuery": "select id + 1 from (select `user`.id, `user`.col from `user` where 1 != 1) as t where 1 != 1", - "Query": "select id + 1 from (select `user`.id, `user`.col from `user`) as t", - "Table": "`user`" + "Query": "select id + 1 from (select `user`.id, `user`.col from `user`) as t" }, { "OperatorType": "Route", @@ -3408,8 +3227,7 @@ "Sharded": true }, "FieldQuery": "select 1 from user_extra where 1 != 1", - "Query": "select 1 from user_extra", - "Table": "user_extra" + "Query": "select 1 from user_extra" } ] }, @@ -3447,7 +3265,6 @@ }, "FieldQuery": "select `name`, keyspace_id from name_user_vdx where 1 != 1", "Query": "select `name`, keyspace_id from name_user_vdx where `name` in ::__vals", - "Table": "name_user_vdx", "Values": [ "::name" ], @@ -3461,8 +3278,7 @@ "Sharded": true }, "FieldQuery": "select u.a from (select id as b, `name` from `user` where 1 != 1) as u(a, n) where 1 != 1", - "Query": "select u.a from (select id as b, `name` from `user` where `name` = 1) as u(a, n)", - "Table": "`user`" + "Query": "select u.a from (select id as b, `name` from `user` where `name` = 1) as u(a, n)" } ] }, @@ -3499,7 +3315,6 @@ }, "FieldQuery": "select `name`, keyspace_id from name_user_vdx where 1 != 1", "Query": "select `name`, keyspace_id from name_user_vdx where `name` in ::__vals", - "Table": "name_user_vdx", "Values": [ "::name" ], @@ -3513,8 +3328,7 @@ "Sharded": true }, "FieldQuery": "select u.a from (select id as b, `name` from `user` where 1 != 1) as u(a, n) where 1 != 1", - "Query": "select u.a from (select id as b, `name` from `user` where b = 1 and `name` = 1) as u(a, n)", - "Table": "`user`" + "Query": "select u.a from (select id as b, `name` from `user` where b = 1 and `name` = 1) as u(a, n)" } ] }, @@ -3534,7 +3348,6 @@ "OperatorType": "Join", "Variant": "Join", "JoinColumnIndexes": "L:0", - "TableName": "`user`_user_extra", "Inputs": [ { "OperatorType": "Route", @@ -3544,8 +3357,7 @@ "Sharded": true }, "FieldQuery": "select i + 1 from (select `user`.id from `user` where 1 != 1) as t(i) where 1 != 1", - "Query": "select i + 1 from (select `user`.id from `user`) as t(i)", - "Table": "`user`" + "Query": "select i + 1 from (select `user`.id from `user`) as t(i)" }, { "OperatorType": "Route", @@ -3555,8 +3367,7 @@ "Sharded": true }, "FieldQuery": "select 1 from user_extra where 1 != 1", - "Query": "select 1 from user_extra", - "Table": "user_extra" + "Query": "select 1 from user_extra" } ] }, @@ -3593,8 +3404,7 @@ "Sharded": true }, "FieldQuery": "select user_id from user_extra where 1 != 1", - "Query": "select user_id from user_extra limit 1", - "Table": "user_extra" + "Query": "select user_id from user_extra limit 1" } ] }, @@ -3616,8 +3426,7 @@ "Sharded": true }, "FieldQuery": "select id from user_extra where 1 != 1", - "Query": "select id from user_extra", - "Table": "user_extra" + "Query": "select id from user_extra" }, { "InputName": "Outer", @@ -3629,7 +3438,6 @@ }, "FieldQuery": "select id from `user` where 1 != 1", "Query": "select id from `user` where :__sq_has_values and id in ::__vals and col = :__sq2", - "Table": "`user`", "Values": [ "::__sq1" ], @@ -3659,7 +3467,6 @@ "JoinVars": { "u_intcol": 1 }, - "TableName": "`user`_`user`", "Inputs": [ { "OperatorType": "Route", @@ -3669,8 +3476,7 @@ "Sharded": true }, "FieldQuery": "select u.id, u.intcol from `user` as u where 1 != 1", - "Query": "select u.id, u.intcol from `user` as u", - "Table": "`user`" + "Query": "select u.id, u.intcol from `user` as u" }, { "OperatorType": "Route", @@ -3680,8 +3486,7 @@ "Sharded": true }, "FieldQuery": "select 1 from `user` as uu where 1 != 1", - "Query": "select 1 from `user` as uu where uu.intcol = :u_intcol /* INT16 */", - "Table": "`user`" + "Query": "select 1 from `user` as uu where uu.intcol = :u_intcol /* INT16 */" } ] }, @@ -3704,13 +3509,11 @@ "JoinVars": { "t_col1": 1 }, - "TableName": "`user`_unsharded_unsharded", "Inputs": [ { "OperatorType": "Join", "Variant": "Join", "JoinColumnIndexes": "L:0,L:1", - "TableName": "`user`_unsharded", "Inputs": [ { "OperatorType": "Route", @@ -3720,8 +3523,7 @@ "Sharded": true }, "FieldQuery": "select 0, t.col1 from (select `user`.col1 from `user` where 1 != 1) as t where 1 != 1", - "Query": "select 0, t.col1 from (select `user`.col1 from `user`) as t", - "Table": "`user`" + "Query": "select 0, t.col1 from (select `user`.col1 from `user`) as t" }, { "OperatorType": "Route", @@ -3731,8 +3533,7 @@ "Sharded": false }, "FieldQuery": "select 1 from unsharded where 1 != 1", - "Query": "select 1 from unsharded", - "Table": "unsharded" + "Query": "select 1 from unsharded" } ] }, @@ -3744,8 +3545,7 @@ "Sharded": false }, "FieldQuery": "select 1 from unsharded where 1 != 1", - "Query": "select 1 from unsharded where unsharded.a = :t_col1 and unsharded.col1 = :t_col1", - "Table": "unsharded" + "Query": "select 1 from unsharded where unsharded.a = :t_col1 and unsharded.col1 = :t_col1" } ] }, @@ -3774,7 +3574,6 @@ "JoinVars": { "user_col": 1 }, - "TableName": "`user`_user_extra", "Inputs": [ { "OperatorType": "Route", @@ -3784,8 +3583,7 @@ "Sharded": true }, "FieldQuery": "select `user`.id, `user`.col from `user` where 1 != 1", - "Query": "select `user`.id, `user`.col from `user`", - "Table": "`user`" + "Query": "select `user`.id, `user`.col from `user`" }, { "OperatorType": "Route", @@ -3795,8 +3593,7 @@ "Sharded": true }, "FieldQuery": "select user_extra.col from user_extra where 1 != 1", - "Query": "select user_extra.col from user_extra where user_extra.col = :user_col /* INT16 */", - "Table": "user_extra" + "Query": "select user_extra.col from user_extra where user_extra.col = :user_col /* INT16 */" } ] } @@ -3819,7 +3616,6 @@ "OperatorType": "Join", "Variant": "Join", "JoinColumnIndexes": "L:0", - "TableName": "unsharded_unsharded_tab", "Inputs": [ { "OperatorType": "Route", @@ -3829,8 +3625,7 @@ "Sharded": false }, "FieldQuery": "select 1 from unsharded where 1 != 1", - "Query": "select 1 from unsharded", - "Table": "unsharded" + "Query": "select 1 from unsharded" }, { "OperatorType": "Route", @@ -3840,8 +3635,7 @@ "Sharded": false }, "FieldQuery": "select 1 from unsharded_tab where 1 != 1", - "Query": "select 1 from unsharded_tab", - "Table": "unsharded_tab" + "Query": "select 1 from unsharded_tab" } ] }, @@ -3866,8 +3660,7 @@ "Sharded": false }, "FieldQuery": "select * from unsharded_a join unsharded_b using (propertyId) where 1 != 1", - "Query": "select * from unsharded_a join unsharded_b using (propertyId)", - "Table": "unsharded_a, unsharded_b" + "Query": "select * from unsharded_a join unsharded_b using (propertyId)" }, "TablesUsed": [ "main.unsharded_a", @@ -3890,8 +3683,7 @@ "Sharded": true }, "FieldQuery": "select id2 from (select id from `user` where 1 != 1) as x(id2) where 1 != 1", - "Query": "select id2 from (select id from `user`) as x(id2)", - "Table": "`user`" + "Query": "select id2 from (select id from `user`) as x(id2)" }, "TablesUsed": [ "user.user" @@ -3913,8 +3705,7 @@ "Sharded": false }, "FieldQuery": "select col from (select col from unsharded join unsharded_b where 1 != 1) as u join unsharded_a as ua where 1 != 1", - "Query": "select col from (select col from unsharded join unsharded_b) as u join unsharded_a as ua limit 1", - "Table": "unsharded, unsharded_a, unsharded_b" + "Query": "select col from (select col from unsharded join unsharded_b) as u join unsharded_a as ua limit 1" }, "TablesUsed": [ "main.unsharded", @@ -3938,13 +3729,11 @@ "OperatorType": "Join", "Variant": "Join", "JoinColumnIndexes": "L:0", - "TableName": "`user`_user_extra_user_extra", "Inputs": [ { "OperatorType": "Join", "Variant": "Join", "JoinColumnIndexes": "L:0", - "TableName": "`user`_user_extra", "Inputs": [ { "OperatorType": "Route", @@ -3954,8 +3743,7 @@ "Sharded": true }, "FieldQuery": "select u.col from (select `user`.col from `user` where 1 != 1) as u where 1 != 1", - "Query": "select u.col from (select `user`.col from `user`) as u", - "Table": "`user`" + "Query": "select u.col from (select `user`.col from `user`) as u" }, { "OperatorType": "Route", @@ -3965,8 +3753,7 @@ "Sharded": true }, "FieldQuery": "select 1 from user_extra where 1 != 1", - "Query": "select 1 from user_extra", - "Table": "user_extra" + "Query": "select 1 from user_extra" } ] }, @@ -3982,8 +3769,7 @@ "Sharded": true }, "FieldQuery": "select 1 from user_extra as ue where 1 != 1", - "Query": "select 1 from user_extra as ue limit 1", - "Table": "user_extra" + "Query": "select 1 from user_extra as ue limit 1" } ] } @@ -4017,7 +3803,6 @@ "JoinVars": { "user_col": 0 }, - "TableName": "`user`_user_extra", "Inputs": [ { "OperatorType": "Route", @@ -4027,8 +3812,7 @@ "Sharded": true }, "FieldQuery": "select `user`.col from `user` where 1 != 1", - "Query": "select `user`.col from `user`", - "Table": "`user`" + "Query": "select `user`.col from `user`" }, { "OperatorType": "Route", @@ -4038,8 +3822,7 @@ "Sharded": true }, "FieldQuery": "select user_extra.col from user_extra where 1 != 1", - "Query": "select user_extra.col from user_extra where user_extra.col = :user_col /* INT16 */", - "Table": "user_extra" + "Query": "select user_extra.col from user_extra where user_extra.col = :user_col /* INT16 */" } ] } @@ -4062,7 +3845,6 @@ "OperatorType": "Join", "Variant": "Join", "JoinColumnIndexes": "L:0,L:1", - "TableName": "`user`_user_extra_user_extra", "Inputs": [ { "OperatorType": "Projection", @@ -4078,7 +3860,6 @@ "JoinVars": { "user_col": 1 }, - "TableName": "`user`_user_extra", "Inputs": [ { "OperatorType": "Route", @@ -4088,8 +3869,7 @@ "Sharded": true }, "FieldQuery": "select `user`.id, `user`.col from `user` where 1 != 1", - "Query": "select `user`.id, `user`.col from `user`", - "Table": "`user`" + "Query": "select `user`.id, `user`.col from `user`" }, { "OperatorType": "Route", @@ -4099,8 +3879,7 @@ "Sharded": true }, "FieldQuery": "select user_extra.col from user_extra where 1 != 1", - "Query": "select user_extra.col from user_extra where user_extra.col = :user_col /* INT16 */", - "Table": "user_extra" + "Query": "select user_extra.col from user_extra where user_extra.col = :user_col /* INT16 */" } ] } @@ -4114,8 +3893,7 @@ "Sharded": true }, "FieldQuery": "select 1 from user_extra as e where 1 != 1", - "Query": "select 1 from user_extra as e", - "Table": "user_extra" + "Query": "select 1 from user_extra as e" } ] }, @@ -4145,7 +3923,6 @@ "JoinVars": { "user_col": 1 }, - "TableName": "`user`_user_extra", "Inputs": [ { "OperatorType": "Route", @@ -4155,8 +3932,7 @@ "Sharded": true }, "FieldQuery": "select `user`.foo, `user`.col from `user` where 1 != 1", - "Query": "select `user`.foo, `user`.col from `user`", - "Table": "`user`" + "Query": "select `user`.foo, `user`.col from `user`" }, { "OperatorType": "Route", @@ -4166,8 +3942,7 @@ "Sharded": true }, "FieldQuery": "select user_extra.col from user_extra where 1 != 1", - "Query": "select user_extra.col from user_extra where user_extra.col = :user_col /* INT16 */", - "Table": "user_extra" + "Query": "select user_extra.col from user_extra where user_extra.col = :user_col /* INT16 */" } ] } @@ -4202,8 +3977,7 @@ }, "FieldQuery": "select col1, count(*), weight_string(col1) from (select colC + colD as col1 from `user` where 1 != 1) as tbl where 1 != 1 group by col1, weight_string(col1)", "OrderBy": "(0|2) ASC", - "Query": "select col1, count(*), weight_string(col1) from (select colC + colD as col1 from `user`) as tbl group by col1, weight_string(col1) order by col1 asc", - "Table": "`user`" + "Query": "select col1, count(*), weight_string(col1) from (select colC + colD as col1 from `user`) as tbl group by col1, weight_string(col1) order by col1 asc" } ] }, @@ -4226,7 +4000,6 @@ "JoinVars": { "authoritative_col1": 0 }, - "TableName": "authoritative_unsharded_authoritative", "Inputs": [ { "OperatorType": "Route", @@ -4236,8 +4009,7 @@ "Sharded": true }, "FieldQuery": "select authoritative.col1, authoritative.user_id, authoritative.col2 from authoritative where 1 != 1", - "Query": "select authoritative.col1, authoritative.user_id, authoritative.col2 from authoritative", - "Table": "authoritative" + "Query": "select authoritative.col1, authoritative.user_id, authoritative.col2 from authoritative" }, { "OperatorType": "Route", @@ -4247,8 +4019,7 @@ "Sharded": false }, "FieldQuery": "select unsharded_authoritative.col2 from unsharded_authoritative where 1 != 1", - "Query": "select unsharded_authoritative.col2 from unsharded_authoritative where unsharded_authoritative.col1 = :authoritative_col1 /* VARCHAR */", - "Table": "unsharded_authoritative" + "Query": "select unsharded_authoritative.col2 from unsharded_authoritative where unsharded_authoritative.col1 = :authoritative_col1 /* VARCHAR */" } ] }, @@ -4274,7 +4045,6 @@ }, "FieldQuery": "select push_it from (select bar as push_it from (select foo as bar from (select id as foo from `user` where 1 != 1) as t1 where 1 != 1) as t2 where 1 != 1) as t3 where 1 != 1", "Query": "select push_it from (select bar as push_it from (select foo as bar from (select id as foo from `user` where id = 12) as t1) as t2) as t3", - "Table": "`user`", "Values": [ "12" ], @@ -4300,8 +4070,7 @@ "Sharded": true }, "FieldQuery": "select id, col from (select `user`.id, user_extra.col from `user`, user_extra where 1 != 1) as user_details_view where 1 != 1", - "Query": "select id, col from (select `user`.id, user_extra.col from `user`, user_extra where `user`.id = user_extra.user_id) as user_details_view", - "Table": "`user`, user_extra" + "Query": "select id, col from (select `user`.id, user_extra.col from `user`, user_extra where `user`.id = user_extra.user_id) as user_details_view" }, "TablesUsed": [ "user.user", @@ -4324,8 +4093,7 @@ "Sharded": true }, "FieldQuery": "select id, col from (select `user`.id, user_extra.col from `user`, user_extra where 1 != 1) as user_details_view where 1 != 1", - "Query": "select id, col from (select `user`.id, user_extra.col from `user`, user_extra where `user`.id = user_extra.user_id) as user_details_view", - "Table": "`user`, user_extra" + "Query": "select id, col from (select `user`.id, user_extra.col from `user`, user_extra where `user`.id = user_extra.user_id) as user_details_view" }, "TablesUsed": [ "user.user", @@ -4352,7 +4120,6 @@ "JoinVars": { "user_col": 1 }, - "TableName": "`user`_user_extra", "Inputs": [ { "OperatorType": "Route", @@ -4362,8 +4129,7 @@ "Sharded": true }, "FieldQuery": "select `user`.id, `user`.col from `user` where 1 != 1", - "Query": "select `user`.id, `user`.col from `user`", - "Table": "`user`" + "Query": "select `user`.id, `user`.col from `user`" }, { "OperatorType": "Route", @@ -4373,8 +4139,7 @@ "Sharded": true }, "FieldQuery": "select user_extra.col from user_extra where 1 != 1", - "Query": "select user_extra.col from user_extra where user_extra.col = :user_col /* INT16 */", - "Table": "user_extra" + "Query": "select user_extra.col from user_extra where user_extra.col = :user_col /* INT16 */" } ] } @@ -4401,8 +4166,7 @@ "Sharded": false }, "FieldQuery": "select missing_column from unsharded, unsharded_a where 1 != 1", - "Query": "select missing_column from unsharded, unsharded_a", - "Table": "unsharded, unsharded_a" + "Query": "select missing_column from unsharded, unsharded_a" }, "TablesUsed": [ "main.unsharded", @@ -4426,7 +4190,6 @@ "OperatorType": "Join", "Variant": "LeftJoin", "JoinColumnIndexes": "L:0,R:0", - "TableName": "t1_t1", "Inputs": [ { "OperatorType": "Route", @@ -4436,8 +4199,7 @@ "Sharded": true }, "FieldQuery": "select t1.id1 from t1 where 1 != 1", - "Query": "select t1.id1 from t1", - "Table": "t1" + "Query": "select t1.id1 from t1" }, { "OperatorType": "Route", @@ -4447,8 +4209,7 @@ "Sharded": true }, "FieldQuery": "select t2.id1 from t1 as t2 where 1 != 1", - "Query": "select t2.id1 from t1 as t2 where t2.id1 = t2.id2", - "Table": "t1" + "Query": "select t2.id1 from t1 as t2 where t2.id1 = t2.id2" } ] }, @@ -4472,8 +4233,7 @@ "Sharded": false }, "FieldQuery": "select * from unsharded_authoritative as A left join unsharded_authoritative as B using (col1) where 1 != 1", - "Query": "select * from unsharded_authoritative as A left join unsharded_authoritative as B using (col1)", - "Table": "unsharded_authoritative" + "Query": "select * from unsharded_authoritative as A left join unsharded_authoritative as B using (col1)" }, "TablesUsed": [ "main.unsharded_authoritative" @@ -4494,7 +4254,6 @@ "JoinVars": { "m1_cola": 1 }, - "TableName": "multicol_tbl_multicol_tbl", "Inputs": [ { "OperatorType": "Route", @@ -4504,8 +4263,7 @@ "Sharded": true }, "FieldQuery": "select 1, m1.cola from multicol_tbl as m1 where 1 != 1", - "Query": "select 1, m1.cola from multicol_tbl as m1", - "Table": "multicol_tbl" + "Query": "select 1, m1.cola from multicol_tbl as m1" }, { "OperatorType": "Route", @@ -4516,7 +4274,6 @@ }, "FieldQuery": "select 1 from multicol_tbl as m2 where 1 != 1", "Query": "select 1 from multicol_tbl as m2 where m2.cola = :m1_cola", - "Table": "multicol_tbl", "Values": [ ":m1_cola" ], @@ -4548,7 +4305,6 @@ "ComparisonType": "INT16", "JoinColumnIndexes": "-2", "Predicate": "`user`.col = ue.col", - "TableName": "`user`_user_extra", "Inputs": [ { "OperatorType": "Route", @@ -4558,8 +4314,7 @@ "Sharded": true }, "FieldQuery": "select `user`.col, id from `user` where 1 != 1", - "Query": "select `user`.col, id from `user`", - "Table": "`user`" + "Query": "select `user`.col, id from `user`" }, { "OperatorType": "Limit", @@ -4573,8 +4328,7 @@ "Sharded": true }, "FieldQuery": "select ue.col from (select col from user_extra where 1 != 1) as ue where 1 != 1", - "Query": "select ue.col from (select col from user_extra) as ue limit 10", - "Table": "user_extra" + "Query": "select ue.col from (select col from user_extra) as ue limit 10" } ] } @@ -4600,7 +4354,6 @@ "ComparisonType": "INT16", "JoinColumnIndexes": "-1,2", "Predicate": "u.col = ue.col", - "TableName": "`user`_user_extra", "Inputs": [ { "OperatorType": "Limit", @@ -4614,8 +4367,7 @@ "Sharded": true }, "FieldQuery": "select u.id, u.col from (select id, col from `user` where 1 != 1) as u where 1 != 1", - "Query": "select u.id, u.col from (select id, col from `user`) as u limit 10", - "Table": "`user`" + "Query": "select u.id, u.col from (select id, col from `user`) as u limit 10" } ] }, @@ -4631,8 +4383,7 @@ "Sharded": true }, "FieldQuery": "select ue.col, ue.user_id from (select col, user_id from user_extra where 1 != 1) as ue where 1 != 1", - "Query": "select ue.col, ue.user_id from (select col, user_id from user_extra) as ue limit 10", - "Table": "user_extra" + "Query": "select ue.col, ue.user_id from (select col, user_id from user_extra) as ue limit 10" } ] } @@ -4660,7 +4411,6 @@ }, "FieldQuery": "select id, user_id from (select id, col from `user` where 1 != 1) as u, (select col, user_id from user_extra where 1 != 1) as ue where 1 != 1", "Query": "select id, user_id from (select id, col from `user` where id = 17 limit 10) as u, (select col, user_id from user_extra where user_id = 17 limit 10) as ue where u.col = ue.col", - "Table": "`user`, user_extra", "Values": [ "17" ], @@ -4693,7 +4443,6 @@ "ComparisonType": "INT16", "JoinColumnIndexes": "-1,2,-3,3", "Predicate": "u.col = ue.col", - "TableName": "`user`_user_extra", "Inputs": [ { "OperatorType": "Route", @@ -4703,8 +4452,7 @@ "Sharded": true }, "FieldQuery": "select u.id, u.col, weight_string(u.id) from (select id, col from `user` where 1 != 1) as u where 1 != 1", - "Query": "select distinct u.id, u.col, weight_string(u.id) from (select id, col from `user`) as u", - "Table": "`user`" + "Query": "select distinct u.id, u.col, weight_string(u.id) from (select id, col from `user`) as u" }, { "OperatorType": "Limit", @@ -4718,8 +4466,7 @@ "Sharded": true }, "FieldQuery": "select ue.col, ue.user_id, weight_string(ue.user_id) from (select col, user_id from user_extra where 1 != 1) as ue where 1 != 1", - "Query": "select ue.col, ue.user_id, weight_string(ue.user_id) from (select col, user_id from user_extra) as ue limit 10", - "Table": "user_extra" + "Query": "select ue.col, ue.user_id, weight_string(ue.user_id) from (select col, user_id from user_extra) as ue limit 10" } ] } @@ -4748,8 +4495,7 @@ "Sharded": false }, "FieldQuery": "select x from (select t.*, 1 as x from unsharded as t where 1 != 1 union select t.*, 1 as x from unsharded as t where 1 != 1) as x where 1 != 1", - "Query": "select x from (select t.*, 1 as x from unsharded as t union select t.*, 1 as x from unsharded as t) as x", - "Table": "unsharded" + "Query": "select x from (select t.*, 1 as x from unsharded as t union select t.*, 1 as x from unsharded as t) as x" }, "TablesUsed": [ "main.unsharded" @@ -4787,7 +4533,6 @@ "JoinVars": { "m_id": 0 }, - "TableName": "music_`user`, user_extra", "Inputs": [ { "OperatorType": "Route", @@ -4797,8 +4542,7 @@ "Sharded": true }, "FieldQuery": "select subquery_for_count.`m.id` from (select m.id as `m.id` from music as m where 1 != 1) as subquery_for_count where 1 != 1", - "Query": "select distinct subquery_for_count.`m.id` from (select m.id as `m.id` from music as m) as subquery_for_count", - "Table": "music" + "Query": "select distinct subquery_for_count.`m.id` from (select m.id as `m.id` from music as m) as subquery_for_count" }, { "OperatorType": "Route", @@ -4809,7 +4553,6 @@ }, "FieldQuery": "select subquery_for_count.user_id, weight_string(subquery_for_count.user_id) from (select u.user_id from `user` as u, user_extra as ue where 1 != 1) as subquery_for_count where 1 != 1", "Query": "select distinct subquery_for_count.user_id, weight_string(subquery_for_count.user_id) from (select u.user_id from `user` as u, user_extra as ue where u.id = :m_id and u.id = ue.user_id) as subquery_for_count", - "Table": "`user`, user_extra", "Values": [ ":m_id" ], @@ -4844,7 +4587,6 @@ "JoinVars": { "u_col": 2 }, - "TableName": "`user`_music", "Inputs": [ { "OperatorType": "VindexLookup", @@ -4867,7 +4609,6 @@ }, "FieldQuery": "select `name`, keyspace_id from name_user_vdx where 1 != 1", "Query": "select `name`, keyspace_id from name_user_vdx where `name` in ::__vals", - "Table": "name_user_vdx", "Values": [ "::name" ], @@ -4881,8 +4622,7 @@ "Sharded": true }, "FieldQuery": "select u.intcol, u.id, u.col from `user` as u where 1 != 1", - "Query": "select u.intcol, u.id, u.col from `user` as u where u.`name` = 'bb' and u.id = 3", - "Table": "`user`" + "Query": "select u.intcol, u.id, u.col from `user` as u where u.`name` = 'bb' and u.id = 3" } ] }, @@ -4907,7 +4647,6 @@ }, "FieldQuery": "select `name`, keyspace_id from name_user_vdx where 1 != 1", "Query": "select `name`, keyspace_id from name_user_vdx where `name` in ::__vals", - "Table": "name_user_vdx", "Values": [ "::name" ], @@ -4921,8 +4660,7 @@ "Sharded": true }, "FieldQuery": "select 1 from music as m where 1 != 1", - "Query": "select 1 from music as m where m.user_id = 5 and m.id = 20 and m.col = :u_col /* INT16 */", - "Table": "music" + "Query": "select 1 from music as m where m.user_id = 5 and m.id = 20 and m.col = :u_col /* INT16 */" } ] } @@ -4948,7 +4686,6 @@ "JoinVars": { "t1_id": 1 }, - "TableName": "t1_`user`", "Inputs": [ { "OperatorType": "Route", @@ -4958,8 +4695,7 @@ "Sharded": true }, "FieldQuery": "select 1, t1.id from t1 where 1 != 1", - "Query": "select 1, t1.id from t1", - "Table": "t1" + "Query": "select 1, t1.id from t1" }, { "OperatorType": "Route", @@ -4970,7 +4706,6 @@ }, "FieldQuery": "select 1 from `user` where 1 != 1", "Query": "select 1 from `user` where `user`.id = :t1_id", - "Table": "`user`", "Values": [ ":t1_id" ], @@ -4998,7 +4733,6 @@ "JoinVars": { "u_foo": 0 }, - "TableName": "`user`_user_extra", "Inputs": [ { "OperatorType": "Route", @@ -5008,8 +4742,7 @@ "Sharded": true }, "FieldQuery": "select dt.foo from (select u.foo from `user` as u where 1 != 1) as dt where 1 != 1", - "Query": "select dt.foo from (select u.foo from `user` as u) as dt", - "Table": "`user`" + "Query": "select dt.foo from (select u.foo from `user` as u) as dt" }, { "OperatorType": "Route", @@ -5019,8 +4752,7 @@ "Sharded": true }, "FieldQuery": "select dt.`u.foo * ue.bar` from (select :u_foo * ue.bar as `u.foo * ue.bar` from user_extra as ue where 1 != 1) as dt where 1 != 1", - "Query": "select dt.`u.foo * ue.bar` from (select :u_foo * ue.bar as `u.foo * ue.bar` from user_extra as ue) as dt", - "Table": "user_extra" + "Query": "select dt.`u.foo * ue.bar` from (select :u_foo * ue.bar as `u.foo * ue.bar` from user_extra as ue) as dt" } ] }, diff --git a/go/vt/vtgate/planbuilder/testdata/info_schema57_cases.json b/go/vt/vtgate/planbuilder/testdata/info_schema57_cases.json index 8c9b0b0dfcb..efed1db91a7 100644 --- a/go/vt/vtgate/planbuilder/testdata/info_schema57_cases.json +++ b/go/vt/vtgate/planbuilder/testdata/info_schema57_cases.json @@ -14,8 +14,7 @@ "Sharded": false }, "FieldQuery": "select `TABLE_NAME` from information_schema.`TABLES` where 1 != 1", - "Query": "select `TABLE_NAME` from information_schema.`TABLES`", - "Table": "information_schema.`TABLES`" + "Query": "select `TABLE_NAME` from information_schema.`TABLES`" } } }, @@ -34,8 +33,7 @@ "Sharded": false }, "FieldQuery": "select a.`ENGINE`, b.DATA_TYPE from information_schema.`TABLES` as a, information_schema.`COLUMNS` as b where 1 != 1", - "Query": "select a.`ENGINE`, b.DATA_TYPE from information_schema.`TABLES` as a, information_schema.`COLUMNS` as b", - "Table": "information_schema.`COLUMNS`, information_schema.`TABLES`" + "Query": "select a.`ENGINE`, b.DATA_TYPE from information_schema.`TABLES` as a, information_schema.`COLUMNS` as b" } } }, @@ -54,8 +52,7 @@ "Sharded": false }, "FieldQuery": "select `column_name` from information_schema.`columns` where 1 != 1", - "Query": "select `column_name` from information_schema.`columns` where table_schema = schema()", - "Table": "information_schema.`columns`" + "Query": "select `column_name` from information_schema.`columns` where table_schema = schema()" } } }, @@ -74,8 +71,7 @@ "Sharded": false }, "FieldQuery": "select `tables`.TABLE_SCHEMA, files.`STATUS` from information_schema.`tables`, information_schema.files where 1 != 1", - "Query": "select `tables`.TABLE_SCHEMA, files.`STATUS` from information_schema.`tables`, information_schema.files", - "Table": "information_schema.`tables`, information_schema.files" + "Query": "select `tables`.TABLE_SCHEMA, files.`STATUS` from information_schema.`tables`, information_schema.files" } } }, @@ -94,8 +90,7 @@ "Sharded": false }, "FieldQuery": "select TABLE_CATALOG, TABLE_SCHEMA, `TABLE_NAME`, `COLUMN_NAME`, ORDINAL_POSITION, COLUMN_DEFAULT, IS_NULLABLE, DATA_TYPE, CHARACTER_MAXIMUM_LENGTH, CHARACTER_OCTET_LENGTH, NUMERIC_PRECISION, NUMERIC_SCALE, DATETIME_PRECISION, CHARACTER_SET_NAME, COLLATION_NAME, COLUMN_TYPE, COLUMN_KEY, EXTRA, `PRIVILEGES`, COLUMN_COMMENT, GENERATION_EXPRESSION from information_schema.`COLUMNS` where 1 != 1", - "Query": "select TABLE_CATALOG, TABLE_SCHEMA, `TABLE_NAME`, `COLUMN_NAME`, ORDINAL_POSITION, COLUMN_DEFAULT, IS_NULLABLE, DATA_TYPE, CHARACTER_MAXIMUM_LENGTH, CHARACTER_OCTET_LENGTH, NUMERIC_PRECISION, NUMERIC_SCALE, DATETIME_PRECISION, CHARACTER_SET_NAME, COLLATION_NAME, COLUMN_TYPE, COLUMN_KEY, EXTRA, `PRIVILEGES`, COLUMN_COMMENT, GENERATION_EXPRESSION from information_schema.`COLUMNS` where `COLUMNS`.`COLUMN_NAME` = 'toto'", - "Table": "information_schema.`COLUMNS`" + "Query": "select TABLE_CATALOG, TABLE_SCHEMA, `TABLE_NAME`, `COLUMN_NAME`, ORDINAL_POSITION, COLUMN_DEFAULT, IS_NULLABLE, DATA_TYPE, CHARACTER_MAXIMUM_LENGTH, CHARACTER_OCTET_LENGTH, NUMERIC_PRECISION, NUMERIC_SCALE, DATETIME_PRECISION, CHARACTER_SET_NAME, COLLATION_NAME, COLUMN_TYPE, COLUMN_KEY, EXTRA, `PRIVILEGES`, COLUMN_COMMENT, GENERATION_EXPRESSION from information_schema.`COLUMNS` where `COLUMNS`.`COLUMN_NAME` = 'toto'" } } }, @@ -123,8 +118,7 @@ "Sharded": false }, "FieldQuery": "select `TABLE_NAME` from information_schema.`columns` where 1 != 1", - "Query": "select distinct `TABLE_NAME` from information_schema.`columns`", - "Table": "information_schema.`columns`" + "Query": "select distinct `TABLE_NAME` from information_schema.`columns`" }, { "OperatorType": "Route", @@ -134,8 +128,7 @@ "Sharded": false }, "FieldQuery": "select table_schema from information_schema.`tables` where 1 != 1", - "Query": "select distinct table_schema from information_schema.`tables`", - "Table": "information_schema.`tables`" + "Query": "select distinct table_schema from information_schema.`tables`" } ] } @@ -188,8 +181,7 @@ }, "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 distinct 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 */", - "SysTableTableSchema": "['user']", - "Table": "information_schema.`tables`" + "SysTableTableSchema": "['user']" }, { "OperatorType": "Route", @@ -200,8 +192,7 @@ }, "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 distinct 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 */", - "SysTableTableSchema": "['main']", - "Table": "information_schema.`tables`" + "SysTableTableSchema": "['main']" } ] } @@ -226,8 +217,7 @@ "FieldQuery": "select RC.`CONSTRAINT_NAME`, ORDINAL_POSITION from INFORMATION_SCHEMA.KEY_COLUMN_USAGE as KCU, INFORMATION_SCHEMA.REFERENTIAL_CONSTRAINTS as RC where 1 != 1", "Query": "select RC.`CONSTRAINT_NAME`, ORDINAL_POSITION from INFORMATION_SCHEMA.KEY_COLUMN_USAGE as KCU, INFORMATION_SCHEMA.REFERENTIAL_CONSTRAINTS as RC where KCU.TABLE_SCHEMA = :__vtschemaname /* VARCHAR */ and KCU.`TABLE_NAME` = :KCU_TABLE_NAME /* VARCHAR */ and KCU.`COLUMN_NAME` = 'id' and KCU.REFERENCED_TABLE_SCHEMA = :__vtschemaname /* VARCHAR */ and KCU.`CONSTRAINT_NAME` = 'data_type_table_id_fkey' and KCU.`CONSTRAINT_NAME` = RC.`CONSTRAINT_NAME` order by KCU.`CONSTRAINT_NAME` asc, KCU.`COLUMN_NAME` asc", "SysTableTableName": "[KCU_TABLE_NAME:'data_type_table']", - "SysTableTableSchema": "['test']", - "Table": "INFORMATION_SCHEMA.KEY_COLUMN_USAGE, INFORMATION_SCHEMA.REFERENTIAL_CONSTRAINTS" + "SysTableTableSchema": "['test']" } } }, @@ -248,8 +238,7 @@ "FieldQuery": "select KCU.`TABLE_NAME`, S.`TABLE_NAME` from INFORMATION_SCHEMA.KEY_COLUMN_USAGE as KCU, INFORMATION_SCHEMA.REFERENTIAL_CONSTRAINTS as RC, INFORMATION_SCHEMA.`TABLES` as S where 1 != 1", "Query": "select KCU.`TABLE_NAME`, S.`TABLE_NAME` from INFORMATION_SCHEMA.KEY_COLUMN_USAGE as KCU, INFORMATION_SCHEMA.REFERENTIAL_CONSTRAINTS as RC, INFORMATION_SCHEMA.`TABLES` as S where S.TABLE_SCHEMA = :__vtschemaname /* VARCHAR */ and S.`TABLE_NAME` = :S_TABLE_NAME /* VARCHAR */ and KCU.TABLE_SCHEMA = :__vtschemaname /* VARCHAR */ and KCU.`TABLE_NAME` = :KCU_TABLE_NAME /* VARCHAR */ and KCU.`CONSTRAINT_NAME` = RC.`CONSTRAINT_NAME` order by KCU.`CONSTRAINT_NAME` asc, KCU.`COLUMN_NAME` asc", "SysTableTableName": "[KCU_TABLE_NAME:'data_type_table', S_TABLE_NAME:'sc']", - "SysTableTableSchema": "['test']", - "Table": "INFORMATION_SCHEMA.KEY_COLUMN_USAGE, INFORMATION_SCHEMA.REFERENTIAL_CONSTRAINTS, INFORMATION_SCHEMA.`TABLES`" + "SysTableTableSchema": "['test']" } } }, @@ -269,8 +258,7 @@ }, "FieldQuery": "select routine_name as `name`, routine_definition as definition from information_schema.routines where 1 != 1", "Query": "select routine_name as `name`, routine_definition as definition from information_schema.routines where ROUTINE_SCHEMA = :__vtschemaname /* VARCHAR */ and ROUTINE_TYPE = 'PROCEDURE'", - "SysTableTableSchema": "[:v1]", - "Table": "information_schema.routines" + "SysTableTableSchema": "[:v1]" } } }, @@ -290,8 +278,7 @@ }, "FieldQuery": "select sum(data_length + index_length) as size from information_schema.`TABLES` where 1 != 1", "Query": "select sum(data_length + index_length) as size from information_schema.`TABLES` where table_schema = :__vtschemaname /* VARCHAR */", - "SysTableTableSchema": "[:v1]", - "Table": "information_schema.`TABLES`" + "SysTableTableSchema": "[:v1]" } } }, @@ -309,7 +296,6 @@ "JoinVars": { "kcu_constraint_name": 0 }, - "TableName": "information_schema.key_column_usage_information_schema.referential_constraints", "Inputs": [ { "OperatorType": "Route", @@ -320,8 +306,7 @@ }, "FieldQuery": "select kcu.`constraint_name` as `constraint_name`, kcu.`column_name` as `column_name`, kcu.referenced_table_name as referenced_table_name, kcu.referenced_column_name as referenced_column_name, kcu.ordinal_position as ordinal_position, kcu.`table_name` as `table_name` from information_schema.key_column_usage as kcu where 1 != 1", "Query": "select kcu.`constraint_name` as `constraint_name`, kcu.`column_name` as `column_name`, kcu.referenced_table_name as referenced_table_name, kcu.referenced_column_name as referenced_column_name, kcu.ordinal_position as ordinal_position, kcu.`table_name` as `table_name` from information_schema.key_column_usage as kcu where kcu.table_schema = :__vtschemaname /* VARCHAR */ and kcu.referenced_column_name is not null order by kcu.ordinal_position asc", - "SysTableTableSchema": "[:v1]", - "Table": "information_schema.key_column_usage" + "SysTableTableSchema": "[:v1]" }, { "OperatorType": "Route", @@ -332,8 +317,7 @@ }, "FieldQuery": "select rc.delete_rule as delete_rule, rc.update_rule as update_rule from information_schema.referential_constraints as rc where 1 != 1", "Query": "select rc.delete_rule as delete_rule, rc.update_rule as update_rule from information_schema.referential_constraints as rc where rc.`constraint_schema` = :__vtschemaname /* VARCHAR */ and rc.`constraint_name` = :kcu_constraint_name /* VARCHAR(64) */", - "SysTableTableSchema": "[:v2]", - "Table": "information_schema.referential_constraints" + "SysTableTableSchema": "[:v2]" } ] } @@ -355,8 +339,7 @@ }, "FieldQuery": "select fk.referenced_table_name as to_table, fk.referenced_column_name as primary_key, fk.`column_name` as `column`, fk.`constraint_name` as `name`, rc.update_rule as on_update, rc.delete_rule as on_delete from information_schema.referential_constraints as rc, information_schema.key_column_usage as fk where 1 != 1", "Query": "select fk.referenced_table_name as to_table, fk.referenced_column_name as primary_key, fk.`column_name` as `column`, fk.`constraint_name` as `name`, rc.update_rule as on_update, rc.delete_rule as on_delete from information_schema.referential_constraints as rc, information_schema.key_column_usage as fk where rc.`constraint_schema` = database() and rc.`table_name` = :rc_table_name /* VARCHAR */ and fk.referenced_column_name is not null and fk.table_schema = database() and fk.`table_name` = :fk_table_name /* VARCHAR */ and rc.`constraint_schema` = fk.`constraint_schema` and rc.`constraint_name` = fk.`constraint_name`", - "SysTableTableName": "[fk_table_name:':vtg1', rc_table_name:':vtg1']", - "Table": "information_schema.key_column_usage, information_schema.referential_constraints" + "SysTableTableName": "[fk_table_name:':vtg1', rc_table_name:':vtg1']" } } }, @@ -376,8 +359,7 @@ }, "FieldQuery": "select `CATALOG_NAME`, `SCHEMA_NAME`, DEFAULT_CHARACTER_SET_NAME, DEFAULT_COLLATION_NAME, SQL_PATH from information_schema.schemata where 1 != 1", "Query": "select `CATALOG_NAME`, `SCHEMA_NAME`, DEFAULT_CHARACTER_SET_NAME, DEFAULT_COLLATION_NAME, SQL_PATH from information_schema.schemata where `schema_name` = :__vtschemaname /* VARCHAR */", - "SysTableTableSchema": "['user']", - "Table": "information_schema.schemata" + "SysTableTableSchema": "['user']" } } }, @@ -398,8 +380,7 @@ "FieldQuery": "select table_comment from information_schema.`tables` where 1 != 1", "Query": "select table_comment from information_schema.`tables` where table_schema = :__vtschemaname /* VARCHAR */ and `table_name` = :table_name /* VARCHAR */", "SysTableTableName": "[table_name:'table_name']", - "SysTableTableSchema": "['schema_name']", - "Table": "information_schema.`tables`" + "SysTableTableSchema": "['schema_name']" } } }, @@ -420,8 +401,7 @@ "FieldQuery": "select fk.referenced_table_name as to_table, fk.referenced_column_name as primary_key, fk.`column_name` as `column`, fk.`constraint_name` as `name`, rc.update_rule as on_update, rc.delete_rule as on_delete from information_schema.referential_constraints as rc, information_schema.key_column_usage as fk where 1 != 1", "Query": "select fk.referenced_table_name as to_table, fk.referenced_column_name as primary_key, fk.`column_name` as `column`, fk.`constraint_name` as `name`, rc.update_rule as on_update, rc.delete_rule as on_delete from information_schema.referential_constraints as rc, information_schema.key_column_usage as fk where rc.`constraint_schema` = :__vtschemaname /* VARCHAR */ and rc.`table_name` = :rc_table_name /* VARCHAR */ and fk.referenced_column_name is not null and fk.table_schema = :__vtschemaname /* VARCHAR */ and fk.`table_name` = :fk_table_name /* VARCHAR */ and rc.`constraint_schema` = fk.`constraint_schema` and rc.`constraint_name` = fk.`constraint_name`", "SysTableTableName": "[fk_table_name:'table_name', rc_table_name:'table_name']", - "SysTableTableSchema": "['table_schema']", - "Table": "information_schema.key_column_usage, information_schema.referential_constraints" + "SysTableTableSchema": "['table_schema']" } } }, @@ -442,8 +422,7 @@ "FieldQuery": "select `column_name` from information_schema.statistics where 1 != 1", "Query": "select `column_name` from information_schema.statistics where index_name = 'PRIMARY' and table_schema = :__vtschemaname /* VARCHAR */ and `table_name` = :table_name /* VARCHAR */ order by seq_in_index asc", "SysTableTableName": "[table_name:'table_name']", - "SysTableTableSchema": "['table_schema']", - "Table": "information_schema.statistics" + "SysTableTableSchema": "['table_schema']" } } }, @@ -464,8 +443,7 @@ "FieldQuery": "select generation_expression from information_schema.`columns` where 1 != 1", "Query": "select generation_expression from information_schema.`columns` where table_schema = :__vtschemaname /* VARCHAR */ and `table_name` = :table_name /* VARCHAR */ and `column_name` = 'column_name'", "SysTableTableName": "[table_name:'table_name']", - "SysTableTableSchema": "['table_schema']", - "Table": "information_schema.`columns`" + "SysTableTableSchema": "['table_schema']" } } }, @@ -484,8 +462,7 @@ "Sharded": false }, "FieldQuery": "select id from information_schema.`processlist` where 1 != 1", - "Query": "select id from information_schema.`processlist` where info like '% FOR UPDATE'", - "Table": "information_schema.`processlist`" + "Query": "select id from information_schema.`processlist` where info like '% FOR UPDATE'" } } }, @@ -505,8 +482,7 @@ }, "FieldQuery": "select `table_name` from (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) as _subquery where 1 != 1", "Query": "select `table_name` from (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 */) as _subquery", - "SysTableTableSchema": "['table_schema']", - "Table": "information_schema.`tables`" + "SysTableTableSchema": "['table_schema']" } } }, @@ -526,8 +502,7 @@ }, "FieldQuery": "select `table_name` from (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) as _subquery where 1 != 1", "Query": "select `table_name` from (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_type = 'table_type' and `table_name` = 'table_name') as _subquery", - "SysTableTableSchema": "['table_schema']", - "Table": "information_schema.`tables`" + "SysTableTableSchema": "['table_schema']" } } }, @@ -548,8 +523,7 @@ "FieldQuery": "select count(*) from INFORMATION_SCHEMA.`TABLES` where 1 != 1", "Query": "select count(*) from INFORMATION_SCHEMA.`TABLES` where table_schema = :__vtschemaname /* VARCHAR */ and `table_name` = :table_name /* VARCHAR */", "SysTableTableName": "[table_name:'foo']", - "SysTableTableSchema": "['performance_schema']", - "Table": "INFORMATION_SCHEMA.`TABLES`" + "SysTableTableSchema": "['performance_schema']" } } }, @@ -568,8 +542,7 @@ "Sharded": false }, "FieldQuery": "select `TABLES`.`CHECKSUM` from information_schema.`TABLES` where 1 != 1", - "Query": "select `TABLES`.`CHECKSUM` from information_schema.`TABLES` where `TABLE_NAME` in (select `TABLE_NAME` from information_schema.`COLUMNS`)", - "Table": "information_schema.`TABLES`" + "Query": "select `TABLES`.`CHECKSUM` from information_schema.`TABLES` where `TABLE_NAME` in (select `TABLE_NAME` from information_schema.`COLUMNS`)" } } }, @@ -589,8 +562,7 @@ }, "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 */ and TABLE_SCHEMA = :__vtschemaname /* VARCHAR */", - "SysTableTableSchema": "['user', 'main']", - "Table": "INFORMATION_SCHEMA.`TABLES`" + "SysTableTableSchema": "['user', 'main']" } } }, @@ -609,8 +581,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 = database()", - "Table": "INFORMATION_SCHEMA.`TABLES`" + "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 = database()" } } }, @@ -630,8 +601,7 @@ }, "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 */", - "SysTableTableSchema": "['ks']", - "Table": "INFORMATION_SCHEMA.`TABLES`" + "SysTableTableSchema": "['ks']" } } }, @@ -652,8 +622,7 @@ "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 */ and `TABLE_NAME` = :TABLE_NAME /* VARCHAR */", "SysTableTableName": "[TABLE_NAME:'route1']", - "SysTableTableSchema": "['ks']", - "Table": "INFORMATION_SCHEMA.`TABLES`" + "SysTableTableSchema": "['ks']" } } }, @@ -673,8 +642,7 @@ }, "FieldQuery": "select `TABLE_NAME` from INFORMATION_SCHEMA.`TABLES` where 1 != 1", "Query": "select `TABLE_NAME` from INFORMATION_SCHEMA.`TABLES` where TABLE_SCHEMA = :__vtschemaname /* VARCHAR */ and DATA_FREE = 42", - "SysTableTableSchema": "['ks']", - "Table": "INFORMATION_SCHEMA.`TABLES`" + "SysTableTableSchema": "['ks']" } } }, @@ -694,8 +662,7 @@ }, "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 */ and (DATA_FREE = 42 or `CHECKSUM` = 'value')", - "SysTableTableSchema": "['ks']", - "Table": "INFORMATION_SCHEMA.`TABLES`" + "SysTableTableSchema": "['ks']" } } }, @@ -714,8 +681,7 @@ "Sharded": false }, "FieldQuery": "select x.`table_name` from (select `CONSTRAINT_CATALOG`, `CONSTRAINT_SCHEMA`, `CONSTRAINT_NAME`, TABLE_CATALOG, TABLE_SCHEMA, `TABLE_NAME`, `COLUMN_NAME`, ORDINAL_POSITION, POSITION_IN_UNIQUE_CONSTRAINT, REFERENCED_TABLE_SCHEMA, REFERENCED_TABLE_NAME, REFERENCED_COLUMN_NAME from information_schema.key_column_usage as a where 1 != 1) as x where 1 != 1", - "Query": "select x.`table_name` from (select `CONSTRAINT_CATALOG`, `CONSTRAINT_SCHEMA`, `CONSTRAINT_NAME`, TABLE_CATALOG, TABLE_SCHEMA, `TABLE_NAME`, `COLUMN_NAME`, ORDINAL_POSITION, POSITION_IN_UNIQUE_CONSTRAINT, REFERENCED_TABLE_SCHEMA, REFERENCED_TABLE_NAME, REFERENCED_COLUMN_NAME from information_schema.key_column_usage as a) as x", - "Table": "information_schema.key_column_usage" + "Query": "select x.`table_name` from (select `CONSTRAINT_CATALOG`, `CONSTRAINT_SCHEMA`, `CONSTRAINT_NAME`, TABLE_CATALOG, TABLE_SCHEMA, `TABLE_NAME`, `COLUMN_NAME`, ORDINAL_POSITION, POSITION_IN_UNIQUE_CONSTRAINT, REFERENCED_TABLE_SCHEMA, REFERENCED_TABLE_NAME, REFERENCED_COLUMN_NAME from information_schema.key_column_usage as a) as x" } } }, @@ -733,7 +699,6 @@ "JoinVars": { "x_COLUMN_NAME": 1 }, - "TableName": "information_schema.key_column_usage_`user`", "Inputs": [ { "OperatorType": "Route", @@ -743,8 +708,7 @@ "Sharded": false }, "FieldQuery": "select x.`table_name`, x.`COLUMN_NAME` from (select `CONSTRAINT_CATALOG`, `CONSTRAINT_SCHEMA`, `CONSTRAINT_NAME`, TABLE_CATALOG, TABLE_SCHEMA, `TABLE_NAME`, `COLUMN_NAME`, ORDINAL_POSITION, POSITION_IN_UNIQUE_CONSTRAINT, REFERENCED_TABLE_SCHEMA, REFERENCED_TABLE_NAME, REFERENCED_COLUMN_NAME from information_schema.key_column_usage as a where 1 != 1) as x where 1 != 1", - "Query": "select x.`table_name`, x.`COLUMN_NAME` from (select `CONSTRAINT_CATALOG`, `CONSTRAINT_SCHEMA`, `CONSTRAINT_NAME`, TABLE_CATALOG, TABLE_SCHEMA, `TABLE_NAME`, `COLUMN_NAME`, ORDINAL_POSITION, POSITION_IN_UNIQUE_CONSTRAINT, REFERENCED_TABLE_SCHEMA, REFERENCED_TABLE_NAME, REFERENCED_COLUMN_NAME from information_schema.key_column_usage as a) as x", - "Table": "information_schema.key_column_usage" + "Query": "select x.`table_name`, x.`COLUMN_NAME` from (select `CONSTRAINT_CATALOG`, `CONSTRAINT_SCHEMA`, `CONSTRAINT_NAME`, TABLE_CATALOG, TABLE_SCHEMA, `TABLE_NAME`, `COLUMN_NAME`, ORDINAL_POSITION, POSITION_IN_UNIQUE_CONSTRAINT, REFERENCED_TABLE_SCHEMA, REFERENCED_TABLE_NAME, REFERENCED_COLUMN_NAME from information_schema.key_column_usage as a) as x" }, { "OperatorType": "Route", @@ -755,7 +719,6 @@ }, "FieldQuery": "select 1 from `user` where 1 != 1", "Query": "select 1 from `user` where `user`.id = :x_COLUMN_NAME /* VARCHAR(64) */", - "Table": "`user`", "Values": [ ":x_COLUMN_NAME" ], @@ -783,8 +746,7 @@ "Sharded": false }, "FieldQuery": "select a.VARIABLE_NAME, a.VARIABLE_VALUE, b.CHARACTER_SET_NAME, b.DEFAULT_COLLATE_NAME, b.DESCRIPTION, b.MAXLEN from information_schema.GLOBAL_STATUS as a, information_schema.CHARACTER_SETS as b where 1 != 1", - "Query": "select a.VARIABLE_NAME, a.VARIABLE_VALUE, b.CHARACTER_SET_NAME, b.DEFAULT_COLLATE_NAME, b.DESCRIPTION, b.MAXLEN from information_schema.GLOBAL_STATUS as a, information_schema.CHARACTER_SETS as b", - "Table": "information_schema.CHARACTER_SETS, information_schema.GLOBAL_STATUS" + "Query": "select a.VARIABLE_NAME, a.VARIABLE_VALUE, b.CHARACTER_SET_NAME, b.DEFAULT_COLLATE_NAME, b.DESCRIPTION, b.MAXLEN from information_schema.GLOBAL_STATUS as a, information_schema.CHARACTER_SETS as b" } } }, @@ -804,8 +766,7 @@ }, "FieldQuery": "select a.`table_name` from (select `CONSTRAINT_CATALOG`, `CONSTRAINT_SCHEMA`, `CONSTRAINT_NAME`, TABLE_CATALOG, TABLE_SCHEMA, `TABLE_NAME`, `COLUMN_NAME`, ORDINAL_POSITION, POSITION_IN_UNIQUE_CONSTRAINT, REFERENCED_TABLE_SCHEMA, REFERENCED_TABLE_NAME, REFERENCED_COLUMN_NAME from information_schema.key_column_usage as a where 1 != 1) as a, (select `CONSTRAINT_CATALOG`, `CONSTRAINT_SCHEMA`, `CONSTRAINT_NAME`, UNIQUE_CONSTRAINT_CATALOG, UNIQUE_CONSTRAINT_SCHEMA, UNIQUE_CONSTRAINT_NAME, MATCH_OPTION, UPDATE_RULE, DELETE_RULE, `TABLE_NAME`, REFERENCED_TABLE_NAME from information_schema.referential_constraints where 1 != 1) as b where 1 != 1", "Query": "select a.`table_name` from (select `CONSTRAINT_CATALOG`, `CONSTRAINT_SCHEMA`, `CONSTRAINT_NAME`, TABLE_CATALOG, TABLE_SCHEMA, `TABLE_NAME`, `COLUMN_NAME`, ORDINAL_POSITION, POSITION_IN_UNIQUE_CONSTRAINT, REFERENCED_TABLE_SCHEMA, REFERENCED_TABLE_NAME, REFERENCED_COLUMN_NAME from information_schema.key_column_usage as a where a.`table_name` = :a_table_name /* VARCHAR */) as a, (select `CONSTRAINT_CATALOG`, `CONSTRAINT_SCHEMA`, `CONSTRAINT_NAME`, UNIQUE_CONSTRAINT_CATALOG, UNIQUE_CONSTRAINT_SCHEMA, UNIQUE_CONSTRAINT_NAME, MATCH_OPTION, UPDATE_RULE, DELETE_RULE, `TABLE_NAME`, REFERENCED_TABLE_NAME from information_schema.referential_constraints where `table_name` = :table_name /* VARCHAR */) as b", - "SysTableTableName": "[a_table_name:'users', table_name:'users']", - "Table": "information_schema.key_column_usage, information_schema.referential_constraints" + "SysTableTableName": "[a_table_name:'users', table_name:'users']" } } }, @@ -833,8 +794,7 @@ }, "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 */", - "SysTableTableSchema": "['music']", - "Table": "information_schema.`tables`" + "SysTableTableSchema": "['music']" }, { "OperatorType": "Route", @@ -845,8 +805,7 @@ }, "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", - "SysTableTableSchema": "['music']", - "Table": "information_schema.views" + "SysTableTableSchema": "['music']" } ] } @@ -873,8 +832,7 @@ }, "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 */", - "SysTableTableSchema": "['music']", - "Table": "information_schema.`tables`" + "SysTableTableSchema": "['music']" }, { "OperatorType": "Route", @@ -885,8 +843,7 @@ }, "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", - "SysTableTableSchema": "['music']", - "Table": "information_schema.views" + "SysTableTableSchema": "['music']" } ] } @@ -911,8 +868,7 @@ }, "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 */ and table_schema = :__vtschemaname /* VARCHAR */", - "SysTableTableSchema": "['music', 'Music']", - "Table": "information_schema.`tables`" + "SysTableTableSchema": "['music', 'Music']" }, { "OperatorType": "Route", @@ -923,8 +879,7 @@ }, "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 */ and table_schema = :__vtschemaname /* VARCHAR */ limit 1", - "SysTableTableSchema": "['music', 'user']", - "Table": "information_schema.views" + "SysTableTableSchema": "['music', 'user']" } ] } @@ -949,8 +904,7 @@ }, "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 */ and table_schema = :__vtschemaname /* VARCHAR */", - "SysTableTableSchema": "['music', 'Music']", - "Table": "information_schema.`tables`" + "SysTableTableSchema": "['music', 'Music']" }, { "OperatorType": "Route", @@ -961,8 +915,7 @@ }, "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 */ and table_schema = :__vtschemaname /* VARCHAR */ limit 1", - "SysTableTableSchema": "['music', 'user']", - "Table": "information_schema.views" + "SysTableTableSchema": "['music', 'user']" } ] } @@ -999,8 +952,7 @@ }, "FieldQuery": "select 1 as `found` from information_schema.`tables` where 1 != 1", "Query": "select 1 as `found` from information_schema.`tables` where `table_name` = :table_name1 /* VARCHAR */ and `table_name` = :table_name1 /* VARCHAR */ limit :__upper_limit", - "SysTableTableName": "[table_name1:'Music']", - "Table": "information_schema.`tables`" + "SysTableTableName": "[table_name1:'Music']" }, { "OperatorType": "Route", @@ -1011,8 +963,7 @@ }, "FieldQuery": "select 1 as `found` from information_schema.views where 1 != 1", "Query": "select 1 as `found` from information_schema.views where `table_name` = :table_name2 /* VARCHAR */ and `table_name` = :table_name2 /* VARCHAR */ limit :__upper_limit", - "SysTableTableName": "[table_name2:'user']", - "Table": "information_schema.views" + "SysTableTableName": "[table_name2:'user']" } ] } @@ -1028,8 +979,7 @@ }, "FieldQuery": "select 1 as `found` from information_schema.`tables` where 1 != 1", "Query": "select 1 as `found` from information_schema.`tables` where `table_name` = :table_name /* VARCHAR */ and `table_name` = :table_name /* VARCHAR */ and :__sq_has_values", - "SysTableTableName": "[table_name:'Music']", - "Table": "information_schema.`tables`" + "SysTableTableName": "[table_name:'Music']" } ] } @@ -1060,8 +1010,7 @@ }, "FieldQuery": "select `TABLE_NAME` from information_schema.`tables` as t where 1 != 1", "Query": "select distinct `TABLE_NAME` from information_schema.`tables` as t where t.TABLE_SCHEMA = :__vtschemaname /* VARCHAR */", - "SysTableTableSchema": "['a']", - "Table": "information_schema.`tables`" + "SysTableTableSchema": "['a']" }, { "OperatorType": "Route", @@ -1071,8 +1020,7 @@ "Sharded": false }, "FieldQuery": "select `TABLE_NAME` from information_schema.`columns` where 1 != 1", - "Query": "select distinct `TABLE_NAME` from information_schema.`columns`", - "Table": "information_schema.`columns`" + "Query": "select distinct `TABLE_NAME` from information_schema.`columns`" } ] } @@ -1114,8 +1062,7 @@ }, "FieldQuery": "select `TABLE_NAME` from information_schema.`tables` as t where 1 != 1", "Query": "select distinct `TABLE_NAME` from information_schema.`tables` as t where t.TABLE_SCHEMA = :__vtschemaname /* VARCHAR */", - "SysTableTableSchema": "['a']", - "Table": "information_schema.`tables`" + "SysTableTableSchema": "['a']" }, { "OperatorType": "Route", @@ -1125,8 +1072,7 @@ "Sharded": false }, "FieldQuery": "select `COLUMN_NAME` from information_schema.`columns` where 1 != 1", - "Query": "select distinct `COLUMN_NAME` from information_schema.`columns`", - "Table": "information_schema.`columns`" + "Query": "select distinct `COLUMN_NAME` from information_schema.`columns`" } ] } @@ -1141,8 +1087,7 @@ "Sharded": false }, "FieldQuery": "select COLLATION_NAME from information_schema.`COLUMNS` as t where 1 != 1", - "Query": "select COLLATION_NAME from information_schema.`COLUMNS` as t where :__sq_has_values and `COLUMN_NAME` in ::__sq1", - "Table": "information_schema.`COLUMNS`" + "Query": "select COLLATION_NAME from information_schema.`COLUMNS` as t where :__sq_has_values and `COLUMN_NAME` in ::__sq1" } ] } @@ -1163,8 +1108,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 = 'ks' or TABLE_SCHEMA = 'main'", - "Table": "INFORMATION_SCHEMA.`TABLES`" + "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 = 'ks' or TABLE_SCHEMA = 'main'" } } }, @@ -1183,8 +1127,7 @@ "Sharded": false }, "FieldQuery": "select `TABLE_NAME` from information_schema.apa where 1 != 1", - "Query": "select `TABLE_NAME` from information_schema.apa", - "Table": "information_schema.apa" + "Query": "select `TABLE_NAME` from information_schema.apa" } } }, @@ -1203,8 +1146,7 @@ "Sharded": false }, "FieldQuery": "select c.`column_name` from (select `table_name` from information_schema.`tables` where 1 != 1) as `tables`, information_schema.`columns` as c where 1 != 1", - "Query": "select c.`column_name` from (select `table_name` from information_schema.`tables` where table_schema != 'information_schema' limit 1) as `tables`, information_schema.`columns` as c where `tables`.`table_name` = c.`table_name`", - "Table": "information_schema.`columns`, information_schema.`tables`" + "Query": "select c.`column_name` from (select `table_name` from information_schema.`tables` where table_schema != 'information_schema' limit 1) as `tables`, information_schema.`columns` as c where `tables`.`table_name` = c.`table_name`" } } } diff --git a/go/vt/vtgate/planbuilder/testdata/info_schema80_cases.json b/go/vt/vtgate/planbuilder/testdata/info_schema80_cases.json index 8a38a2c5399..fcf78c4159f 100644 --- a/go/vt/vtgate/planbuilder/testdata/info_schema80_cases.json +++ b/go/vt/vtgate/planbuilder/testdata/info_schema80_cases.json @@ -14,8 +14,7 @@ "Sharded": false }, "FieldQuery": "select `TABLE_NAME` from information_schema.`TABLES` where 1 != 1", - "Query": "select `TABLE_NAME` from information_schema.`TABLES`", - "Table": "information_schema.`TABLES`" + "Query": "select `TABLE_NAME` from information_schema.`TABLES`" } } }, @@ -34,8 +33,7 @@ "Sharded": false }, "FieldQuery": "select a.`ENGINE`, b.DATA_TYPE from information_schema.`TABLES` as a, information_schema.`COLUMNS` as b where 1 != 1", - "Query": "select a.`ENGINE`, b.DATA_TYPE from information_schema.`TABLES` as a, information_schema.`COLUMNS` as b", - "Table": "information_schema.`COLUMNS`, information_schema.`TABLES`" + "Query": "select a.`ENGINE`, b.DATA_TYPE from information_schema.`TABLES` as a, information_schema.`COLUMNS` as b" } } }, @@ -54,8 +52,7 @@ "Sharded": false }, "FieldQuery": "select `column_name` from information_schema.`columns` where 1 != 1", - "Query": "select `column_name` from information_schema.`columns` where table_schema = schema()", - "Table": "information_schema.`columns`" + "Query": "select `column_name` from information_schema.`columns` where table_schema = schema()" } } }, @@ -74,8 +71,7 @@ "Sharded": false }, "FieldQuery": "select `tables`.TABLE_SCHEMA, files.`STATUS` from information_schema.`tables`, information_schema.files where 1 != 1", - "Query": "select `tables`.TABLE_SCHEMA, files.`STATUS` from information_schema.`tables`, information_schema.files", - "Table": "information_schema.`tables`, information_schema.files" + "Query": "select `tables`.TABLE_SCHEMA, files.`STATUS` from information_schema.`tables`, information_schema.files" } } }, @@ -94,8 +90,7 @@ "Sharded": false }, "FieldQuery": "select TABLE_CATALOG, TABLE_SCHEMA, `TABLE_NAME`, `COLUMN_NAME`, ORDINAL_POSITION, COLUMN_DEFAULT, IS_NULLABLE, DATA_TYPE, CHARACTER_MAXIMUM_LENGTH, CHARACTER_OCTET_LENGTH, NUMERIC_PRECISION, NUMERIC_SCALE, DATETIME_PRECISION, CHARACTER_SET_NAME, COLLATION_NAME, COLUMN_TYPE, COLUMN_KEY, EXTRA, `PRIVILEGES`, COLUMN_COMMENT, GENERATION_EXPRESSION, SRS_ID from information_schema.`COLUMNS` where 1 != 1", - "Query": "select TABLE_CATALOG, TABLE_SCHEMA, `TABLE_NAME`, `COLUMN_NAME`, ORDINAL_POSITION, COLUMN_DEFAULT, IS_NULLABLE, DATA_TYPE, CHARACTER_MAXIMUM_LENGTH, CHARACTER_OCTET_LENGTH, NUMERIC_PRECISION, NUMERIC_SCALE, DATETIME_PRECISION, CHARACTER_SET_NAME, COLLATION_NAME, COLUMN_TYPE, COLUMN_KEY, EXTRA, `PRIVILEGES`, COLUMN_COMMENT, GENERATION_EXPRESSION, SRS_ID from information_schema.`COLUMNS` where `COLUMNS`.`COLUMN_NAME` = 'toto'", - "Table": "information_schema.`COLUMNS`" + "Query": "select TABLE_CATALOG, TABLE_SCHEMA, `TABLE_NAME`, `COLUMN_NAME`, ORDINAL_POSITION, COLUMN_DEFAULT, IS_NULLABLE, DATA_TYPE, CHARACTER_MAXIMUM_LENGTH, CHARACTER_OCTET_LENGTH, NUMERIC_PRECISION, NUMERIC_SCALE, DATETIME_PRECISION, CHARACTER_SET_NAME, COLLATION_NAME, COLUMN_TYPE, COLUMN_KEY, EXTRA, `PRIVILEGES`, COLUMN_COMMENT, GENERATION_EXPRESSION, SRS_ID from information_schema.`COLUMNS` where `COLUMNS`.`COLUMN_NAME` = 'toto'" } } }, @@ -123,8 +118,7 @@ "Sharded": false }, "FieldQuery": "select `TABLE_NAME` from information_schema.`columns` where 1 != 1", - "Query": "select distinct `TABLE_NAME` from information_schema.`columns`", - "Table": "information_schema.`columns`" + "Query": "select distinct `TABLE_NAME` from information_schema.`columns`" }, { "OperatorType": "Route", @@ -134,8 +128,7 @@ "Sharded": false }, "FieldQuery": "select table_schema from information_schema.`tables` where 1 != 1", - "Query": "select distinct table_schema from information_schema.`tables`", - "Table": "information_schema.`tables`" + "Query": "select distinct table_schema from information_schema.`tables`" } ] } @@ -188,8 +181,7 @@ }, "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 distinct 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 */", - "SysTableTableSchema": "['user']", - "Table": "information_schema.`tables`" + "SysTableTableSchema": "['user']" }, { "OperatorType": "Route", @@ -200,8 +192,7 @@ }, "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 distinct 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 */", - "SysTableTableSchema": "['main']", - "Table": "information_schema.`tables`" + "SysTableTableSchema": "['main']" } ] } @@ -226,8 +217,7 @@ "FieldQuery": "select RC.`CONSTRAINT_NAME`, ORDINAL_POSITION from INFORMATION_SCHEMA.KEY_COLUMN_USAGE as KCU, INFORMATION_SCHEMA.REFERENTIAL_CONSTRAINTS as RC where 1 != 1", "Query": "select RC.`CONSTRAINT_NAME`, ORDINAL_POSITION from INFORMATION_SCHEMA.KEY_COLUMN_USAGE as KCU, INFORMATION_SCHEMA.REFERENTIAL_CONSTRAINTS as RC where KCU.TABLE_SCHEMA = :__vtschemaname /* VARCHAR */ and KCU.`TABLE_NAME` = :KCU_TABLE_NAME /* VARCHAR */ and KCU.`COLUMN_NAME` = 'id' and KCU.REFERENCED_TABLE_SCHEMA = :__vtschemaname /* VARCHAR */ and KCU.`CONSTRAINT_NAME` = 'data_type_table_id_fkey' and KCU.`CONSTRAINT_NAME` = RC.`CONSTRAINT_NAME` order by KCU.`CONSTRAINT_NAME` asc, KCU.`COLUMN_NAME` asc", "SysTableTableName": "[KCU_TABLE_NAME:'data_type_table']", - "SysTableTableSchema": "['test']", - "Table": "INFORMATION_SCHEMA.KEY_COLUMN_USAGE, INFORMATION_SCHEMA.REFERENTIAL_CONSTRAINTS" + "SysTableTableSchema": "['test']" } } }, @@ -248,8 +238,7 @@ "FieldQuery": "select KCU.`TABLE_NAME`, S.`TABLE_NAME` from INFORMATION_SCHEMA.KEY_COLUMN_USAGE as KCU, INFORMATION_SCHEMA.REFERENTIAL_CONSTRAINTS as RC, INFORMATION_SCHEMA.`TABLES` as S where 1 != 1", "Query": "select KCU.`TABLE_NAME`, S.`TABLE_NAME` from INFORMATION_SCHEMA.KEY_COLUMN_USAGE as KCU, INFORMATION_SCHEMA.REFERENTIAL_CONSTRAINTS as RC, INFORMATION_SCHEMA.`TABLES` as S where S.TABLE_SCHEMA = :__vtschemaname /* VARCHAR */ and S.`TABLE_NAME` = :S_TABLE_NAME /* VARCHAR */ and KCU.TABLE_SCHEMA = :__vtschemaname /* VARCHAR */ and KCU.`TABLE_NAME` = :KCU_TABLE_NAME /* VARCHAR */ and KCU.`CONSTRAINT_NAME` = RC.`CONSTRAINT_NAME` order by KCU.`CONSTRAINT_NAME` asc, KCU.`COLUMN_NAME` asc", "SysTableTableName": "[KCU_TABLE_NAME:'data_type_table', S_TABLE_NAME:'sc']", - "SysTableTableSchema": "['test']", - "Table": "INFORMATION_SCHEMA.KEY_COLUMN_USAGE, INFORMATION_SCHEMA.REFERENTIAL_CONSTRAINTS, INFORMATION_SCHEMA.`TABLES`" + "SysTableTableSchema": "['test']" } } }, @@ -269,8 +258,7 @@ }, "FieldQuery": "select routine_name as `name`, routine_definition as definition from information_schema.routines where 1 != 1", "Query": "select routine_name as `name`, routine_definition as definition from information_schema.routines where ROUTINE_SCHEMA = :__vtschemaname /* VARCHAR */ and ROUTINE_TYPE = 'PROCEDURE'", - "SysTableTableSchema": "[:v1]", - "Table": "information_schema.routines" + "SysTableTableSchema": "[:v1]" } } }, @@ -290,8 +278,7 @@ }, "FieldQuery": "select sum(data_length + index_length) as size from information_schema.`TABLES` where 1 != 1", "Query": "select sum(data_length + index_length) as size from information_schema.`TABLES` where table_schema = :__vtschemaname /* VARCHAR */", - "SysTableTableSchema": "[:v1]", - "Table": "information_schema.`TABLES`" + "SysTableTableSchema": "[:v1]" } } }, @@ -309,7 +296,6 @@ "JoinVars": { "kcu_constraint_name": 0 }, - "TableName": "information_schema.key_column_usage_information_schema.referential_constraints", "Inputs": [ { "OperatorType": "Route", @@ -320,8 +306,7 @@ }, "FieldQuery": "select kcu.`constraint_name` as `constraint_name`, kcu.`column_name` as `column_name`, kcu.referenced_table_name as referenced_table_name, kcu.referenced_column_name as referenced_column_name, kcu.ordinal_position as ordinal_position, kcu.`table_name` as `table_name` from information_schema.key_column_usage as kcu where 1 != 1", "Query": "select kcu.`constraint_name` as `constraint_name`, kcu.`column_name` as `column_name`, kcu.referenced_table_name as referenced_table_name, kcu.referenced_column_name as referenced_column_name, kcu.ordinal_position as ordinal_position, kcu.`table_name` as `table_name` from information_schema.key_column_usage as kcu where kcu.table_schema = :__vtschemaname /* VARCHAR */ and kcu.referenced_column_name is not null order by kcu.ordinal_position asc", - "SysTableTableSchema": "[:v1]", - "Table": "information_schema.key_column_usage" + "SysTableTableSchema": "[:v1]" }, { "OperatorType": "Route", @@ -332,8 +317,7 @@ }, "FieldQuery": "select rc.delete_rule as delete_rule, rc.update_rule as update_rule from information_schema.referential_constraints as rc where 1 != 1", "Query": "select rc.delete_rule as delete_rule, rc.update_rule as update_rule from information_schema.referential_constraints as rc where rc.`constraint_schema` = :__vtschemaname /* VARCHAR */ and rc.`constraint_name` = :kcu_constraint_name /* VARCHAR(64) */", - "SysTableTableSchema": "[:v2]", - "Table": "information_schema.referential_constraints" + "SysTableTableSchema": "[:v2]" } ] } @@ -355,8 +339,7 @@ }, "FieldQuery": "select fk.referenced_table_name as to_table, fk.referenced_column_name as primary_key, fk.`column_name` as `column`, fk.`constraint_name` as `name`, rc.update_rule as on_update, rc.delete_rule as on_delete from information_schema.referential_constraints as rc, information_schema.key_column_usage as fk where 1 != 1", "Query": "select fk.referenced_table_name as to_table, fk.referenced_column_name as primary_key, fk.`column_name` as `column`, fk.`constraint_name` as `name`, rc.update_rule as on_update, rc.delete_rule as on_delete from information_schema.referential_constraints as rc, information_schema.key_column_usage as fk where rc.`constraint_schema` = database() and rc.`table_name` = :rc_table_name /* VARCHAR */ and fk.referenced_column_name is not null and fk.table_schema = database() and fk.`table_name` = :fk_table_name /* VARCHAR */ and rc.`constraint_schema` = fk.`constraint_schema` and rc.`constraint_name` = fk.`constraint_name`", - "SysTableTableName": "[fk_table_name:':vtg1', rc_table_name:':vtg1']", - "Table": "information_schema.key_column_usage, information_schema.referential_constraints" + "SysTableTableName": "[fk_table_name:':vtg1', rc_table_name:':vtg1']" } } }, @@ -376,8 +359,7 @@ }, "FieldQuery": "select `CATALOG_NAME`, `SCHEMA_NAME`, DEFAULT_CHARACTER_SET_NAME, DEFAULT_COLLATION_NAME, SQL_PATH, DEFAULT_ENCRYPTION from information_schema.schemata where 1 != 1", "Query": "select `CATALOG_NAME`, `SCHEMA_NAME`, DEFAULT_CHARACTER_SET_NAME, DEFAULT_COLLATION_NAME, SQL_PATH, DEFAULT_ENCRYPTION from information_schema.schemata where `schema_name` = :__vtschemaname /* VARCHAR */", - "SysTableTableSchema": "['user']", - "Table": "information_schema.schemata" + "SysTableTableSchema": "['user']" } } }, @@ -398,8 +380,7 @@ "FieldQuery": "select table_comment from information_schema.`tables` where 1 != 1", "Query": "select table_comment from information_schema.`tables` where table_schema = :__vtschemaname /* VARCHAR */ and `table_name` = :table_name /* VARCHAR */", "SysTableTableName": "[table_name:'table_name']", - "SysTableTableSchema": "['schema_name']", - "Table": "information_schema.`tables`" + "SysTableTableSchema": "['schema_name']" } } }, @@ -420,8 +401,7 @@ "FieldQuery": "select fk.referenced_table_name as to_table, fk.referenced_column_name as primary_key, fk.`column_name` as `column`, fk.`constraint_name` as `name`, rc.update_rule as on_update, rc.delete_rule as on_delete from information_schema.referential_constraints as rc, information_schema.key_column_usage as fk where 1 != 1", "Query": "select fk.referenced_table_name as to_table, fk.referenced_column_name as primary_key, fk.`column_name` as `column`, fk.`constraint_name` as `name`, rc.update_rule as on_update, rc.delete_rule as on_delete from information_schema.referential_constraints as rc, information_schema.key_column_usage as fk where rc.`constraint_schema` = :__vtschemaname /* VARCHAR */ and rc.`table_name` = :rc_table_name /* VARCHAR */ and fk.referenced_column_name is not null and fk.table_schema = :__vtschemaname /* VARCHAR */ and fk.`table_name` = :fk_table_name /* VARCHAR */ and rc.`constraint_schema` = fk.`constraint_schema` and rc.`constraint_name` = fk.`constraint_name`", "SysTableTableName": "[fk_table_name:'table_name', rc_table_name:'table_name']", - "SysTableTableSchema": "['table_schema']", - "Table": "information_schema.key_column_usage, information_schema.referential_constraints" + "SysTableTableSchema": "['table_schema']" } } }, @@ -440,7 +420,6 @@ "cc_constraint_name": 0, "cc_constraint_schema": 2 }, - "TableName": "information_schema.check_constraints_information_schema.table_constraints", "Inputs": [ { "OperatorType": "Route", @@ -451,8 +430,7 @@ }, "FieldQuery": "select cc.`constraint_name` as `name`, cc.check_clause as expression, cc.`constraint_schema` from information_schema.check_constraints as cc where 1 != 1", "Query": "select cc.`constraint_name` as `name`, cc.check_clause as expression, cc.`constraint_schema` from information_schema.check_constraints as cc where cc.`constraint_schema` = :__vtschemaname /* VARCHAR */", - "SysTableTableSchema": "['constraint_schema']", - "Table": "information_schema.check_constraints" + "SysTableTableSchema": "['constraint_schema']" }, { "OperatorType": "Route", @@ -464,8 +442,7 @@ "FieldQuery": "select 1 from information_schema.table_constraints as tc where 1 != 1", "Query": "select 1 from information_schema.table_constraints as tc where tc.table_schema = :__vtschemaname /* VARCHAR */ and tc.`table_name` = :tc_table_name /* VARCHAR */ and tc.`constraint_name` = :cc_constraint_name /* VARCHAR(64) */ and tc.`constraint_schema` = :cc_constraint_schema /* VARCHAR(64) */", "SysTableTableName": "[tc_table_name:'table_name']", - "SysTableTableSchema": "['table_schema']", - "Table": "information_schema.table_constraints" + "SysTableTableSchema": "['table_schema']" } ] } @@ -488,8 +465,7 @@ "FieldQuery": "select `column_name` from information_schema.statistics where 1 != 1", "Query": "select `column_name` from information_schema.statistics where index_name = 'PRIMARY' and table_schema = :__vtschemaname /* VARCHAR */ and `table_name` = :table_name /* VARCHAR */ order by seq_in_index asc", "SysTableTableName": "[table_name:'table_name']", - "SysTableTableSchema": "['table_schema']", - "Table": "information_schema.statistics" + "SysTableTableSchema": "['table_schema']" } } }, @@ -510,8 +486,7 @@ "FieldQuery": "select generation_expression from information_schema.`columns` where 1 != 1", "Query": "select generation_expression from information_schema.`columns` where table_schema = :__vtschemaname /* VARCHAR */ and `table_name` = :table_name /* VARCHAR */ and `column_name` = 'column_name'", "SysTableTableName": "[table_name:'table_name']", - "SysTableTableSchema": "['table_schema']", - "Table": "information_schema.`columns`" + "SysTableTableSchema": "['table_schema']" } } }, @@ -530,8 +505,7 @@ "Sharded": false }, "FieldQuery": "select id from information_schema.`processlist` where 1 != 1", - "Query": "select id from information_schema.`processlist` where info like '% FOR UPDATE'", - "Table": "information_schema.`processlist`" + "Query": "select id from information_schema.`processlist` where info like '% FOR UPDATE'" } } }, @@ -551,8 +525,7 @@ }, "FieldQuery": "select `table_name` from (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) as _subquery where 1 != 1", "Query": "select `table_name` from (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 */) as _subquery", - "SysTableTableSchema": "['table_schema']", - "Table": "information_schema.`tables`" + "SysTableTableSchema": "['table_schema']" } } }, @@ -572,8 +545,7 @@ }, "FieldQuery": "select `table_name` from (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) as _subquery where 1 != 1", "Query": "select `table_name` from (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_type = 'table_type' and `table_name` = 'table_name') as _subquery", - "SysTableTableSchema": "['table_schema']", - "Table": "information_schema.`tables`" + "SysTableTableSchema": "['table_schema']" } } }, @@ -593,8 +565,7 @@ }, "FieldQuery": "select cc.`constraint_name` as `name` from information_schema.check_constraints as cc where 1 != 1", "Query": "select cc.`constraint_name` as `name` from information_schema.check_constraints as cc where cc.`constraint_schema` = :__vtschemaname /* VARCHAR */ and cc.`CONSTRAINT_CATALOG` = 'a'", - "SysTableTableSchema": "['a']", - "Table": "information_schema.check_constraints" + "SysTableTableSchema": "['a']" } } }, @@ -615,8 +586,7 @@ "FieldQuery": "select count(*) from INFORMATION_SCHEMA.`TABLES` where 1 != 1", "Query": "select count(*) from INFORMATION_SCHEMA.`TABLES` where table_schema = :__vtschemaname /* VARCHAR */ and `table_name` = :table_name /* VARCHAR */", "SysTableTableName": "[table_name:'foo']", - "SysTableTableSchema": "['performance_schema']", - "Table": "INFORMATION_SCHEMA.`TABLES`" + "SysTableTableSchema": "['performance_schema']" } } }, @@ -635,8 +605,7 @@ "Sharded": false }, "FieldQuery": "select `TABLES`.`CHECKSUM` from information_schema.`TABLES` where 1 != 1", - "Query": "select `TABLES`.`CHECKSUM` from information_schema.`TABLES` where `TABLE_NAME` in (select `TABLE_NAME` from information_schema.`COLUMNS`)", - "Table": "information_schema.`TABLES`" + "Query": "select `TABLES`.`CHECKSUM` from information_schema.`TABLES` where `TABLE_NAME` in (select `TABLE_NAME` from information_schema.`COLUMNS`)" } } }, @@ -656,8 +625,7 @@ }, "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 */ and TABLE_SCHEMA = :__vtschemaname /* VARCHAR */", - "SysTableTableSchema": "['user', 'main']", - "Table": "INFORMATION_SCHEMA.`TABLES`" + "SysTableTableSchema": "['user', 'main']" } } }, @@ -676,8 +644,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 = database()", - "Table": "INFORMATION_SCHEMA.`TABLES`" + "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 = database()" } } }, @@ -697,8 +664,7 @@ }, "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 */", - "SysTableTableSchema": "['ks']", - "Table": "INFORMATION_SCHEMA.`TABLES`" + "SysTableTableSchema": "['ks']" } } }, @@ -719,8 +685,7 @@ "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 */ and `TABLE_NAME` = :TABLE_NAME /* VARCHAR */", "SysTableTableName": "[TABLE_NAME:'route1']", - "SysTableTableSchema": "['ks']", - "Table": "INFORMATION_SCHEMA.`TABLES`" + "SysTableTableSchema": "['ks']" } } }, @@ -740,8 +705,7 @@ }, "FieldQuery": "select `TABLE_NAME` from INFORMATION_SCHEMA.`TABLES` where 1 != 1", "Query": "select `TABLE_NAME` from INFORMATION_SCHEMA.`TABLES` where TABLE_SCHEMA = :__vtschemaname /* VARCHAR */ and DATA_FREE = 42", - "SysTableTableSchema": "['ks']", - "Table": "INFORMATION_SCHEMA.`TABLES`" + "SysTableTableSchema": "['ks']" } } }, @@ -761,8 +725,7 @@ }, "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 */ and (DATA_FREE = 42 or `CHECKSUM` = 'value')", - "SysTableTableSchema": "['ks']", - "Table": "INFORMATION_SCHEMA.`TABLES`" + "SysTableTableSchema": "['ks']" } } }, @@ -781,8 +744,7 @@ "Sharded": false }, "FieldQuery": "select x.`table_name` from (select `CONSTRAINT_CATALOG`, `CONSTRAINT_SCHEMA`, `CONSTRAINT_NAME`, TABLE_CATALOG, TABLE_SCHEMA, `TABLE_NAME`, `COLUMN_NAME`, ORDINAL_POSITION, POSITION_IN_UNIQUE_CONSTRAINT, REFERENCED_TABLE_SCHEMA, REFERENCED_TABLE_NAME, REFERENCED_COLUMN_NAME from information_schema.key_column_usage as a where 1 != 1) as x where 1 != 1", - "Query": "select x.`table_name` from (select `CONSTRAINT_CATALOG`, `CONSTRAINT_SCHEMA`, `CONSTRAINT_NAME`, TABLE_CATALOG, TABLE_SCHEMA, `TABLE_NAME`, `COLUMN_NAME`, ORDINAL_POSITION, POSITION_IN_UNIQUE_CONSTRAINT, REFERENCED_TABLE_SCHEMA, REFERENCED_TABLE_NAME, REFERENCED_COLUMN_NAME from information_schema.key_column_usage as a) as x", - "Table": "information_schema.key_column_usage" + "Query": "select x.`table_name` from (select `CONSTRAINT_CATALOG`, `CONSTRAINT_SCHEMA`, `CONSTRAINT_NAME`, TABLE_CATALOG, TABLE_SCHEMA, `TABLE_NAME`, `COLUMN_NAME`, ORDINAL_POSITION, POSITION_IN_UNIQUE_CONSTRAINT, REFERENCED_TABLE_SCHEMA, REFERENCED_TABLE_NAME, REFERENCED_COLUMN_NAME from information_schema.key_column_usage as a) as x" } } }, @@ -800,7 +762,6 @@ "JoinVars": { "x_COLUMN_NAME": 1 }, - "TableName": "information_schema.key_column_usage_`user`", "Inputs": [ { "OperatorType": "Route", @@ -810,8 +771,7 @@ "Sharded": false }, "FieldQuery": "select x.`table_name`, x.`COLUMN_NAME` from (select `CONSTRAINT_CATALOG`, `CONSTRAINT_SCHEMA`, `CONSTRAINT_NAME`, TABLE_CATALOG, TABLE_SCHEMA, `TABLE_NAME`, `COLUMN_NAME`, ORDINAL_POSITION, POSITION_IN_UNIQUE_CONSTRAINT, REFERENCED_TABLE_SCHEMA, REFERENCED_TABLE_NAME, REFERENCED_COLUMN_NAME from information_schema.key_column_usage as a where 1 != 1) as x where 1 != 1", - "Query": "select x.`table_name`, x.`COLUMN_NAME` from (select `CONSTRAINT_CATALOG`, `CONSTRAINT_SCHEMA`, `CONSTRAINT_NAME`, TABLE_CATALOG, TABLE_SCHEMA, `TABLE_NAME`, `COLUMN_NAME`, ORDINAL_POSITION, POSITION_IN_UNIQUE_CONSTRAINT, REFERENCED_TABLE_SCHEMA, REFERENCED_TABLE_NAME, REFERENCED_COLUMN_NAME from information_schema.key_column_usage as a) as x", - "Table": "information_schema.key_column_usage" + "Query": "select x.`table_name`, x.`COLUMN_NAME` from (select `CONSTRAINT_CATALOG`, `CONSTRAINT_SCHEMA`, `CONSTRAINT_NAME`, TABLE_CATALOG, TABLE_SCHEMA, `TABLE_NAME`, `COLUMN_NAME`, ORDINAL_POSITION, POSITION_IN_UNIQUE_CONSTRAINT, REFERENCED_TABLE_SCHEMA, REFERENCED_TABLE_NAME, REFERENCED_COLUMN_NAME from information_schema.key_column_usage as a) as x" }, { "OperatorType": "Route", @@ -822,7 +782,6 @@ }, "FieldQuery": "select 1 from `user` where 1 != 1", "Query": "select 1 from `user` where `user`.id = :x_COLUMN_NAME /* VARCHAR(64) */", - "Table": "`user`", "Values": [ ":x_COLUMN_NAME" ], @@ -850,8 +809,7 @@ "Sharded": false }, "FieldQuery": "select a.`CONSTRAINT_CATALOG`, a.`CONSTRAINT_SCHEMA`, a.`CONSTRAINT_NAME`, a.CHECK_CLAUSE, b.CHARACTER_SET_NAME, b.DEFAULT_COLLATE_NAME, b.DESCRIPTION, b.MAXLEN from information_schema.CHECK_CONSTRAINTS as a, information_schema.CHARACTER_SETS as b where 1 != 1", - "Query": "select a.`CONSTRAINT_CATALOG`, a.`CONSTRAINT_SCHEMA`, a.`CONSTRAINT_NAME`, a.CHECK_CLAUSE, b.CHARACTER_SET_NAME, b.DEFAULT_COLLATE_NAME, b.DESCRIPTION, b.MAXLEN from information_schema.CHECK_CONSTRAINTS as a, information_schema.CHARACTER_SETS as b", - "Table": "information_schema.CHARACTER_SETS, information_schema.CHECK_CONSTRAINTS" + "Query": "select a.`CONSTRAINT_CATALOG`, a.`CONSTRAINT_SCHEMA`, a.`CONSTRAINT_NAME`, a.CHECK_CLAUSE, b.CHARACTER_SET_NAME, b.DEFAULT_COLLATE_NAME, b.DESCRIPTION, b.MAXLEN from information_schema.CHECK_CONSTRAINTS as a, information_schema.CHARACTER_SETS as b" } } }, @@ -871,8 +829,7 @@ }, "FieldQuery": "select a.`table_name` from (select `CONSTRAINT_CATALOG`, `CONSTRAINT_SCHEMA`, `CONSTRAINT_NAME`, TABLE_CATALOG, TABLE_SCHEMA, `TABLE_NAME`, `COLUMN_NAME`, ORDINAL_POSITION, POSITION_IN_UNIQUE_CONSTRAINT, REFERENCED_TABLE_SCHEMA, REFERENCED_TABLE_NAME, REFERENCED_COLUMN_NAME from information_schema.key_column_usage as a where 1 != 1) as a, (select `CONSTRAINT_CATALOG`, `CONSTRAINT_SCHEMA`, `CONSTRAINT_NAME`, UNIQUE_CONSTRAINT_CATALOG, UNIQUE_CONSTRAINT_SCHEMA, UNIQUE_CONSTRAINT_NAME, MATCH_OPTION, UPDATE_RULE, DELETE_RULE, `TABLE_NAME`, REFERENCED_TABLE_NAME from information_schema.referential_constraints where 1 != 1) as b where 1 != 1", "Query": "select a.`table_name` from (select `CONSTRAINT_CATALOG`, `CONSTRAINT_SCHEMA`, `CONSTRAINT_NAME`, TABLE_CATALOG, TABLE_SCHEMA, `TABLE_NAME`, `COLUMN_NAME`, ORDINAL_POSITION, POSITION_IN_UNIQUE_CONSTRAINT, REFERENCED_TABLE_SCHEMA, REFERENCED_TABLE_NAME, REFERENCED_COLUMN_NAME from information_schema.key_column_usage as a where a.`table_name` = :a_table_name /* VARCHAR */) as a, (select `CONSTRAINT_CATALOG`, `CONSTRAINT_SCHEMA`, `CONSTRAINT_NAME`, UNIQUE_CONSTRAINT_CATALOG, UNIQUE_CONSTRAINT_SCHEMA, UNIQUE_CONSTRAINT_NAME, MATCH_OPTION, UPDATE_RULE, DELETE_RULE, `TABLE_NAME`, REFERENCED_TABLE_NAME from information_schema.referential_constraints where `table_name` = :table_name /* VARCHAR */) as b", - "SysTableTableName": "[a_table_name:'users', table_name:'users']", - "Table": "information_schema.key_column_usage, information_schema.referential_constraints" + "SysTableTableName": "[a_table_name:'users', table_name:'users']" } } }, @@ -900,8 +857,7 @@ }, "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 */", - "SysTableTableSchema": "['music']", - "Table": "information_schema.`tables`" + "SysTableTableSchema": "['music']" }, { "OperatorType": "Route", @@ -912,8 +868,7 @@ }, "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", - "SysTableTableSchema": "['music']", - "Table": "information_schema.views" + "SysTableTableSchema": "['music']" } ] } @@ -940,8 +895,7 @@ }, "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 */", - "SysTableTableSchema": "['music']", - "Table": "information_schema.`tables`" + "SysTableTableSchema": "['music']" }, { "OperatorType": "Route", @@ -952,8 +906,7 @@ }, "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", - "SysTableTableSchema": "['music']", - "Table": "information_schema.views" + "SysTableTableSchema": "['music']" } ] } @@ -978,8 +931,7 @@ }, "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 */ and table_schema = :__vtschemaname /* VARCHAR */", - "SysTableTableSchema": "['music', 'Music']", - "Table": "information_schema.`tables`" + "SysTableTableSchema": "['music', 'Music']" }, { "OperatorType": "Route", @@ -990,8 +942,7 @@ }, "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 */ and table_schema = :__vtschemaname /* VARCHAR */ limit 1", - "SysTableTableSchema": "['music', 'user']", - "Table": "information_schema.views" + "SysTableTableSchema": "['music', 'user']" } ] } @@ -1016,8 +967,7 @@ }, "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 */ and table_schema = :__vtschemaname /* VARCHAR */", - "SysTableTableSchema": "['music', 'Music']", - "Table": "information_schema.`tables`" + "SysTableTableSchema": "['music', 'Music']" }, { "OperatorType": "Route", @@ -1028,8 +978,7 @@ }, "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 */ and table_schema = :__vtschemaname /* VARCHAR */ limit 1", - "SysTableTableSchema": "['music', 'user']", - "Table": "information_schema.views" + "SysTableTableSchema": "['music', 'user']" } ] } @@ -1066,8 +1015,7 @@ }, "FieldQuery": "select 1 as `found` from information_schema.`tables` where 1 != 1", "Query": "select 1 as `found` from information_schema.`tables` where `table_name` = :table_name1 /* VARCHAR */ and `table_name` = :table_name1 /* VARCHAR */ limit :__upper_limit", - "SysTableTableName": "[table_name1:'Music']", - "Table": "information_schema.`tables`" + "SysTableTableName": "[table_name1:'Music']" }, { "OperatorType": "Route", @@ -1078,8 +1026,7 @@ }, "FieldQuery": "select 1 as `found` from information_schema.views where 1 != 1", "Query": "select 1 as `found` from information_schema.views where `table_name` = :table_name2 /* VARCHAR */ and `table_name` = :table_name2 /* VARCHAR */ limit :__upper_limit", - "SysTableTableName": "[table_name2:'user']", - "Table": "information_schema.views" + "SysTableTableName": "[table_name2:'user']" } ] } @@ -1095,8 +1042,7 @@ }, "FieldQuery": "select 1 as `found` from information_schema.`tables` where 1 != 1", "Query": "select 1 as `found` from information_schema.`tables` where `table_name` = :table_name /* VARCHAR */ and `table_name` = :table_name /* VARCHAR */ and :__sq_has_values", - "SysTableTableName": "[table_name:'Music']", - "Table": "information_schema.`tables`" + "SysTableTableName": "[table_name:'Music']" } ] } @@ -1127,8 +1073,7 @@ }, "FieldQuery": "select `TABLE_NAME` from information_schema.`tables` as t where 1 != 1", "Query": "select distinct `TABLE_NAME` from information_schema.`tables` as t where t.TABLE_SCHEMA = :__vtschemaname /* VARCHAR */", - "SysTableTableSchema": "['a']", - "Table": "information_schema.`tables`" + "SysTableTableSchema": "['a']" }, { "OperatorType": "Route", @@ -1138,8 +1083,7 @@ "Sharded": false }, "FieldQuery": "select `TABLE_NAME` from information_schema.`columns` where 1 != 1", - "Query": "select distinct `TABLE_NAME` from information_schema.`columns`", - "Table": "information_schema.`columns`" + "Query": "select distinct `TABLE_NAME` from information_schema.`columns`" } ] } @@ -1181,8 +1125,7 @@ }, "FieldQuery": "select `TABLE_NAME` from information_schema.`tables` as t where 1 != 1", "Query": "select distinct `TABLE_NAME` from information_schema.`tables` as t where t.TABLE_SCHEMA = :__vtschemaname /* VARCHAR */", - "SysTableTableSchema": "['a']", - "Table": "information_schema.`tables`" + "SysTableTableSchema": "['a']" }, { "OperatorType": "Route", @@ -1192,8 +1135,7 @@ "Sharded": false }, "FieldQuery": "select `COLUMN_NAME` from information_schema.`columns` where 1 != 1", - "Query": "select distinct `COLUMN_NAME` from information_schema.`columns`", - "Table": "information_schema.`columns`" + "Query": "select distinct `COLUMN_NAME` from information_schema.`columns`" } ] } @@ -1208,8 +1150,7 @@ "Sharded": false }, "FieldQuery": "select COLLATION_NAME from information_schema.`COLUMNS` as t where 1 != 1", - "Query": "select COLLATION_NAME from information_schema.`COLUMNS` as t where :__sq_has_values and `COLUMN_NAME` in ::__sq1", - "Table": "information_schema.`COLUMNS`" + "Query": "select COLLATION_NAME from information_schema.`COLUMNS` as t where :__sq_has_values and `COLUMN_NAME` in ::__sq1" } ] } @@ -1230,8 +1171,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 = 'ks' or TABLE_SCHEMA = 'main'", - "Table": "INFORMATION_SCHEMA.`TABLES`" + "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 = 'ks' or TABLE_SCHEMA = 'main'" } } }, @@ -1250,8 +1190,7 @@ "Sharded": false }, "FieldQuery": "select variable, `value` from sys.sys_config where 1 != 1", - "Query": "select variable, `value` from sys.sys_config", - "Table": "sys.sys_config" + "Query": "select variable, `value` from sys.sys_config" } } }, @@ -1270,8 +1209,7 @@ "Sharded": false }, "FieldQuery": "select host, db from mysql.db where 1 != 1", - "Query": "select host, db from mysql.db", - "Table": "mysql.db" + "Query": "select host, db from mysql.db" } } }, @@ -1290,8 +1228,7 @@ "Sharded": false }, "FieldQuery": "select logged, prio from performance_schema.error_log where 1 != 1", - "Query": "select logged, prio from performance_schema.error_log", - "Table": "performance_schema.error_log" + "Query": "select logged, prio from performance_schema.error_log" } } }, @@ -1310,8 +1247,7 @@ "Sharded": false }, "FieldQuery": "select `TABLE_NAME` from information_schema.apa where 1 != 1", - "Query": "select `TABLE_NAME` from information_schema.apa", - "Table": "information_schema.apa" + "Query": "select `TABLE_NAME` from information_schema.apa" } } }, @@ -1330,8 +1266,7 @@ "Sharded": false }, "FieldQuery": "select c.`column_name` from (select `table_name` from information_schema.`tables` where 1 != 1) as `tables`, information_schema.`columns` as c where 1 != 1", - "Query": "select c.`column_name` from (select `table_name` from information_schema.`tables` where table_schema != 'information_schema' limit 1) as `tables`, information_schema.`columns` as c where `tables`.`table_name` = c.`table_name`", - "Table": "information_schema.`columns`, information_schema.`tables`" + "Query": "select c.`column_name` from (select `table_name` from information_schema.`tables` where table_schema != 'information_schema' limit 1) as `tables`, information_schema.`columns` as c where `tables`.`table_name` = c.`table_name`" } } } diff --git a/go/vt/vtgate/planbuilder/testdata/large_cases.json b/go/vt/vtgate/planbuilder/testdata/large_cases.json index bcbc46853ed..fedaa6aaa58 100644 --- a/go/vt/vtgate/planbuilder/testdata/large_cases.json +++ b/go/vt/vtgate/planbuilder/testdata/large_cases.json @@ -10,7 +10,6 @@ "OperatorType": "Join", "Variant": "Join", "JoinColumnIndexes": "R:0", - "TableName": "music, music_extra_`user`, user_extra, user_metadata_unsharded, unsharded_a, unsharded_auto, unsharded_b", "Inputs": [ { "OperatorType": "Route", @@ -20,14 +19,12 @@ "Sharded": true }, "FieldQuery": "select 1 from music, music_extra where 1 != 1", - "Query": "select 1 from music, music_extra where music.id = music_extra.music_id", - "Table": "music, music_extra" + "Query": "select 1 from music, music_extra where music.id = music_extra.music_id" }, { "OperatorType": "Join", "Variant": "Join", "JoinColumnIndexes": "L:0", - "TableName": "`user`, user_extra, user_metadata_unsharded, unsharded_a, unsharded_auto, unsharded_b", "Inputs": [ { "OperatorType": "Route", @@ -37,8 +34,7 @@ "Sharded": true }, "FieldQuery": "select `user`.id from `user`, user_extra, user_metadata where 1 != 1", - "Query": "select `user`.id from `user`, user_extra, user_metadata where `user`.id = user_extra.user_id and user_metadata.user_id = user_extra.user_id", - "Table": "`user`, user_extra, user_metadata" + "Query": "select `user`.id from `user`, user_extra, user_metadata where `user`.id = user_extra.user_id and user_metadata.user_id = user_extra.user_id" }, { "OperatorType": "Route", @@ -48,8 +44,7 @@ "Sharded": false }, "FieldQuery": "select 1 from unsharded, unsharded_a, unsharded_b, unsharded_auto where 1 != 1", - "Query": "select 1 from unsharded, unsharded_a, unsharded_b, unsharded_auto where unsharded.x = unsharded_a.y", - "Table": "unsharded, unsharded_a, unsharded_auto, unsharded_b" + "Query": "select 1 from unsharded, unsharded_a, unsharded_b, unsharded_auto where unsharded.x = unsharded_a.y" } ] } diff --git a/go/vt/vtgate/planbuilder/testdata/large_union_cases.json b/go/vt/vtgate/planbuilder/testdata/large_union_cases.json index 5ae3554c3eb..7dcfff4378e 100644 --- a/go/vt/vtgate/planbuilder/testdata/large_union_cases.json +++ b/go/vt/vtgate/planbuilder/testdata/large_union_cases.json @@ -26,7 +26,6 @@ }, "FieldQuery": "select dt.c0 as content, dt.c1 as user_id, weight_string(dt.c0), weight_string(dt.c1) from ((select content, user_id from music where 1 != 1) union (select content, user_id from music where 1 != 1)) as dt(c0, c1) where 1 != 1", "Query": "select dt.c0 as content, dt.c1 as user_id, weight_string(dt.c0), weight_string(dt.c1) from ((select content, user_id from music where user_id = 1270698330 order by created_at asc, id asc limit 11) union (select content, user_id from music where user_id = 1270698330 order by created_at asc, id asc limit 11)) as dt(c0, c1)", - "Table": "music", "Values": [ "1270698330" ], @@ -41,7 +40,6 @@ }, "FieldQuery": "select dt.c0 as content, dt.c1 as user_id, weight_string(dt.c0), weight_string(dt.c1) from ((select content, user_id from music where 1 != 1) union (select content, user_id from music where 1 != 1)) as dt(c0, c1) where 1 != 1", "Query": "select dt.c0 as content, dt.c1 as user_id, weight_string(dt.c0), weight_string(dt.c1) from ((select content, user_id from music where user_id = 1270699497 order by created_at asc, id asc limit 11) union (select content, user_id from music where user_id = 1270699497 order by created_at asc, id asc limit 11)) as dt(c0, c1)", - "Table": "music", "Values": [ "1270699497" ], @@ -56,7 +54,6 @@ }, "FieldQuery": "select dt.c0 as content, dt.c1 as user_id, weight_string(dt.c0), weight_string(dt.c1) from (select content, user_id from music where 1 != 1) as dt(c0, c1) where 1 != 1", "Query": "select dt.c0 as content, dt.c1 as user_id, weight_string(dt.c0), weight_string(dt.c1) from (select distinct content, user_id from music where user_id = 1270703806 order by created_at asc, id asc limit 11) as dt(c0, c1)", - "Table": "music", "Values": [ "1270703806" ], @@ -71,7 +68,6 @@ }, "FieldQuery": "select dt.c0 as content, dt.c1 as user_id, weight_string(dt.c0), weight_string(dt.c1) from (select content, user_id from music where 1 != 1) as dt(c0, c1) where 1 != 1", "Query": "select dt.c0 as content, dt.c1 as user_id, weight_string(dt.c0), weight_string(dt.c1) from (select distinct content, user_id from music where user_id = 1270707364 order by created_at asc, id asc limit 11) as dt(c0, c1)", - "Table": "music", "Values": [ "1270707364" ], @@ -86,7 +82,6 @@ }, "FieldQuery": "select dt.c0 as content, dt.c1 as user_id, weight_string(dt.c0), weight_string(dt.c1) from (select content, user_id from music where 1 != 1) as dt(c0, c1) where 1 != 1", "Query": "select dt.c0 as content, dt.c1 as user_id, weight_string(dt.c0), weight_string(dt.c1) from (select distinct content, user_id from music where user_id = 1270714657 order by created_at asc, id asc limit 11) as dt(c0, c1)", - "Table": "music", "Values": [ "1270714657" ], @@ -101,7 +96,6 @@ }, "FieldQuery": "select dt.c0 as content, dt.c1 as user_id, weight_string(dt.c0), weight_string(dt.c1) from (select content, user_id from music where 1 != 1) as dt(c0, c1) where 1 != 1", "Query": "select dt.c0 as content, dt.c1 as user_id, weight_string(dt.c0), weight_string(dt.c1) from (select distinct content, user_id from music where user_id = 1270721330 order by created_at asc, id asc limit 11) as dt(c0, c1)", - "Table": "music", "Values": [ "1270721330" ], @@ -116,7 +110,6 @@ }, "FieldQuery": "select dt.c0 as content, dt.c1 as user_id, weight_string(dt.c0), weight_string(dt.c1) from (select content, user_id from music where 1 != 1) as dt(c0, c1) where 1 != 1", "Query": "select dt.c0 as content, dt.c1 as user_id, weight_string(dt.c0), weight_string(dt.c1) from (select distinct content, user_id from music where user_id = 1270812079 order by created_at asc, id asc limit 11) as dt(c0, c1)", - "Table": "music", "Values": [ "1270812079" ], @@ -131,7 +124,6 @@ }, "FieldQuery": "select dt.c0 as content, dt.c1 as user_id, weight_string(dt.c0), weight_string(dt.c1) from (select content, user_id from music where 1 != 1) as dt(c0, c1) where 1 != 1", "Query": "select dt.c0 as content, dt.c1 as user_id, weight_string(dt.c0), weight_string(dt.c1) from (select distinct content, user_id from music where user_id = 1271011532 order by created_at asc, id asc limit 11) as dt(c0, c1)", - "Table": "music", "Values": [ "1271011532" ], @@ -146,7 +138,6 @@ }, "FieldQuery": "select dt.c0 as content, dt.c1 as user_id, weight_string(dt.c0), weight_string(dt.c1) from (select content, user_id from music where 1 != 1) as dt(c0, c1) where 1 != 1", "Query": "select dt.c0 as content, dt.c1 as user_id, weight_string(dt.c0), weight_string(dt.c1) from (select distinct content, user_id from music where user_id = 1271034164 order by created_at asc, id asc limit 11) as dt(c0, c1)", - "Table": "music", "Values": [ "1271034164" ], @@ -161,7 +152,6 @@ }, "FieldQuery": "select dt.c0 as content, dt.c1 as user_id, weight_string(dt.c0), weight_string(dt.c1) from (select content, user_id from music where 1 != 1) as dt(c0, c1) where 1 != 1", "Query": "select dt.c0 as content, dt.c1 as user_id, weight_string(dt.c0), weight_string(dt.c1) from (select distinct content, user_id from music where user_id = 1271034177 order by created_at asc, id asc limit 11) as dt(c0, c1)", - "Table": "music", "Values": [ "1271034177" ], @@ -176,7 +166,6 @@ }, "FieldQuery": "select dt.c0 as content, dt.c1 as user_id, weight_string(dt.c0), weight_string(dt.c1) from (select content, user_id from music where 1 != 1) as dt(c0, c1) where 1 != 1", "Query": "select dt.c0 as content, dt.c1 as user_id, weight_string(dt.c0), weight_string(dt.c1) from (select distinct content, user_id from music where user_id = 1271066849 order by created_at asc, id asc limit 11) as dt(c0, c1)", - "Table": "music", "Values": [ "1271066849" ], @@ -191,7 +180,6 @@ }, "FieldQuery": "select dt.c0 as content, dt.c1 as user_id, weight_string(dt.c0), weight_string(dt.c1) from (select content, user_id from music where 1 != 1) as dt(c0, c1) where 1 != 1", "Query": "select dt.c0 as content, dt.c1 as user_id, weight_string(dt.c0), weight_string(dt.c1) from (select distinct content, user_id from music where user_id = 1271098740 order by created_at asc, id asc limit 11) as dt(c0, c1)", - "Table": "music", "Values": [ "1271098740" ], @@ -206,7 +194,6 @@ }, "FieldQuery": "select dt.c0 as content, dt.c1 as user_id, weight_string(dt.c0), weight_string(dt.c1) from (select content, user_id from music where 1 != 1) as dt(c0, c1) where 1 != 1", "Query": "select dt.c0 as content, dt.c1 as user_id, weight_string(dt.c0), weight_string(dt.c1) from (select distinct content, user_id from music where user_id = 1271355000 order by created_at asc, id asc limit 11) as dt(c0, c1)", - "Table": "music", "Values": [ "1271355000" ], @@ -221,7 +208,6 @@ }, "FieldQuery": "select dt.c0 as content, dt.c1 as user_id, weight_string(dt.c0), weight_string(dt.c1) from (select content, user_id from music where 1 != 1) as dt(c0, c1) where 1 != 1", "Query": "select dt.c0 as content, dt.c1 as user_id, weight_string(dt.c0), weight_string(dt.c1) from (select distinct content, user_id from music where user_id = 1271639345 order by created_at asc, id asc limit 11) as dt(c0, c1)", - "Table": "music", "Values": [ "1271639345" ], @@ -236,7 +222,6 @@ }, "FieldQuery": "select dt.c0 as content, dt.c1 as user_id, weight_string(dt.c0), weight_string(dt.c1) from (select content, user_id from music where 1 != 1) as dt(c0, c1) where 1 != 1", "Query": "select dt.c0 as content, dt.c1 as user_id, weight_string(dt.c0), weight_string(dt.c1) from (select distinct content, user_id from music where user_id = 1271914117 order by created_at asc, id asc limit 11) as dt(c0, c1)", - "Table": "music", "Values": [ "1271914117" ], @@ -251,7 +236,6 @@ }, "FieldQuery": "select dt.c0 as content, dt.c1 as user_id, weight_string(dt.c0), weight_string(dt.c1) from (select content, user_id from music where 1 != 1) as dt(c0, c1) where 1 != 1", "Query": "select dt.c0 as content, dt.c1 as user_id, weight_string(dt.c0), weight_string(dt.c1) from (select distinct content, user_id from music where user_id = 1271924504 order by created_at asc, id asc limit 11) as dt(c0, c1)", - "Table": "music", "Values": [ "1271924504" ], @@ -266,7 +250,6 @@ }, "FieldQuery": "select dt.c0 as content, dt.c1 as user_id, weight_string(dt.c0), weight_string(dt.c1) from (select content, user_id from music where 1 != 1) as dt(c0, c1) where 1 != 1", "Query": "select dt.c0 as content, dt.c1 as user_id, weight_string(dt.c0), weight_string(dt.c1) from (select distinct content, user_id from music where user_id = 1272086055 order by created_at asc, id asc limit 11) as dt(c0, c1)", - "Table": "music", "Values": [ "1272086055" ], @@ -281,7 +264,6 @@ }, "FieldQuery": "select dt.c0 as content, dt.c1 as user_id, weight_string(dt.c0), weight_string(dt.c1) from (select content, user_id from music where 1 != 1) as dt(c0, c1) where 1 != 1", "Query": "select dt.c0 as content, dt.c1 as user_id, weight_string(dt.c0), weight_string(dt.c1) from (select distinct content, user_id from music where user_id = 1272127855 order by created_at asc, id asc limit 11) as dt(c0, c1)", - "Table": "music", "Values": [ "1272127855" ], @@ -296,7 +278,6 @@ }, "FieldQuery": "select dt.c0 as content, dt.c1 as user_id, weight_string(dt.c0), weight_string(dt.c1) from (select content, user_id from music where 1 != 1) as dt(c0, c1) where 1 != 1", "Query": "select dt.c0 as content, dt.c1 as user_id, weight_string(dt.c0), weight_string(dt.c1) from (select distinct content, user_id from music where user_id = 1272191137 order by created_at asc, id asc limit 11) as dt(c0, c1)", - "Table": "music", "Values": [ "1272191137" ], @@ -311,7 +292,6 @@ }, "FieldQuery": "select dt.c0 as content, dt.c1 as user_id, weight_string(dt.c0), weight_string(dt.c1) from (select content, user_id from music where 1 != 1) as dt(c0, c1) where 1 != 1", "Query": "select dt.c0 as content, dt.c1 as user_id, weight_string(dt.c0), weight_string(dt.c1) from (select distinct content, user_id from music where user_id = 1272468271 order by created_at asc, id asc limit 11) as dt(c0, c1)", - "Table": "music", "Values": [ "1272468271" ], @@ -326,7 +306,6 @@ }, "FieldQuery": "select dt.c0 as content, dt.c1 as user_id, weight_string(dt.c0), weight_string(dt.c1) from (select content, user_id from music where 1 != 1) as dt(c0, c1) where 1 != 1", "Query": "select dt.c0 as content, dt.c1 as user_id, weight_string(dt.c0), weight_string(dt.c1) from (select distinct content, user_id from music where user_id = 1270637436 order by created_at asc, id asc limit 11) as dt(c0, c1)", - "Table": "music", "Values": [ "1270637436" ], @@ -341,7 +320,6 @@ }, "FieldQuery": "select dt.c0 as content, dt.c1 as user_id, weight_string(dt.c0), weight_string(dt.c1) from (select content, user_id from music where 1 != 1) as dt(c0, c1) where 1 != 1", "Query": "select dt.c0 as content, dt.c1 as user_id, weight_string(dt.c0), weight_string(dt.c1) from (select distinct content, user_id from music where user_id = 1270644941 order by created_at asc, id asc limit 11) as dt(c0, c1)", - "Table": "music", "Values": [ "1270644941" ], @@ -356,7 +334,6 @@ }, "FieldQuery": "select dt.c0 as content, dt.c1 as user_id, weight_string(dt.c0), weight_string(dt.c1) from (select content, user_id from music where 1 != 1) as dt(c0, c1) where 1 != 1", "Query": "select dt.c0 as content, dt.c1 as user_id, weight_string(dt.c0), weight_string(dt.c1) from (select distinct content, user_id from music where user_id = 1270650576 order by created_at asc, id asc limit 11) as dt(c0, c1)", - "Table": "music", "Values": [ "1270650576" ], @@ -371,7 +348,6 @@ }, "FieldQuery": "select dt.c0 as content, dt.c1 as user_id, weight_string(dt.c0), weight_string(dt.c1) from (select content, user_id from music where 1 != 1) as dt(c0, c1) where 1 != 1", "Query": "select dt.c0 as content, dt.c1 as user_id, weight_string(dt.c0), weight_string(dt.c1) from (select distinct content, user_id from music where user_id = 1270652906 order by created_at asc, id asc limit 11) as dt(c0, c1)", - "Table": "music", "Values": [ "1270652906" ], @@ -386,7 +362,6 @@ }, "FieldQuery": "select dt.c0 as content, dt.c1 as user_id, weight_string(dt.c0), weight_string(dt.c1) from (select content, user_id from music where 1 != 1) as dt(c0, c1) where 1 != 1", "Query": "select dt.c0 as content, dt.c1 as user_id, weight_string(dt.c0), weight_string(dt.c1) from (select distinct content, user_id from music where user_id = 1270660650 order by created_at asc, id asc limit 11) as dt(c0, c1)", - "Table": "music", "Values": [ "1270660650" ], @@ -401,7 +376,6 @@ }, "FieldQuery": "select dt.c0 as content, dt.c1 as user_id, weight_string(dt.c0), weight_string(dt.c1) from (select content, user_id from music where 1 != 1) as dt(c0, c1) where 1 != 1", "Query": "select dt.c0 as content, dt.c1 as user_id, weight_string(dt.c0), weight_string(dt.c1) from (select distinct content, user_id from music where user_id = 1270670201 order by created_at asc, id asc limit 11) as dt(c0, c1)", - "Table": "music", "Values": [ "1270670201" ], @@ -416,7 +390,6 @@ }, "FieldQuery": "select dt.c0 as content, dt.c1 as user_id, weight_string(dt.c0), weight_string(dt.c1) from (select content, user_id from music where 1 != 1) as dt(c0, c1) where 1 != 1", "Query": "select dt.c0 as content, dt.c1 as user_id, weight_string(dt.c0), weight_string(dt.c1) from (select distinct content, user_id from music where user_id = 1270707364 order by created_at asc, id asc limit 11) as dt(c0, c1)", - "Table": "music", "Values": [ "1270707364" ], @@ -431,7 +404,6 @@ }, "FieldQuery": "select dt.c0 as content, dt.c1 as user_id, weight_string(dt.c0), weight_string(dt.c1) from (select content, user_id from music where 1 != 1) as dt(c0, c1) where 1 != 1", "Query": "select dt.c0 as content, dt.c1 as user_id, weight_string(dt.c0), weight_string(dt.c1) from (select distinct content, user_id from music where user_id = 1271365691 order by created_at asc, id asc limit 11) as dt(c0, c1)", - "Table": "music", "Values": [ "1271365691" ], @@ -446,7 +418,6 @@ }, "FieldQuery": "select dt.c0 as content, dt.c1 as user_id, weight_string(dt.c0), weight_string(dt.c1) from (select content, user_id from music where 1 != 1) as dt(c0, c1) where 1 != 1", "Query": "select dt.c0 as content, dt.c1 as user_id, weight_string(dt.c0), weight_string(dt.c1) from (select distinct content, user_id from music where user_id = 1271799956 order by created_at asc, id asc limit 11) as dt(c0, c1)", - "Table": "music", "Values": [ "1271799956" ], @@ -461,7 +432,6 @@ }, "FieldQuery": "select dt.c0 as content, dt.c1 as user_id, weight_string(dt.c0), weight_string(dt.c1) from (select content, user_id from music where 1 != 1) as dt(c0, c1) where 1 != 1", "Query": "select dt.c0 as content, dt.c1 as user_id, weight_string(dt.c0), weight_string(dt.c1) from (select distinct content, user_id from music where user_id = 1271914117 order by created_at asc, id asc limit 11) as dt(c0, c1)", - "Table": "music", "Values": [ "1271914117" ], @@ -476,7 +446,6 @@ }, "FieldQuery": "select dt.c0 as content, dt.c1 as user_id, weight_string(dt.c0), weight_string(dt.c1) from (select content, user_id from music where 1 != 1) as dt(c0, c1) where 1 != 1", "Query": "select dt.c0 as content, dt.c1 as user_id, weight_string(dt.c0), weight_string(dt.c1) from (select distinct content, user_id from music where user_id = 1270637436 order by created_at asc, id asc limit 11) as dt(c0, c1)", - "Table": "music", "Values": [ "1270637436" ], @@ -491,7 +460,6 @@ }, "FieldQuery": "select dt.c0 as content, dt.c1 as user_id, weight_string(dt.c0), weight_string(dt.c1) from (select content, user_id from music where 1 != 1) as dt(c0, c1) where 1 != 1", "Query": "select dt.c0 as content, dt.c1 as user_id, weight_string(dt.c0), weight_string(dt.c1) from (select distinct content, user_id from music where user_id = 1271799956 order by created_at asc, id asc limit 11) as dt(c0, c1)", - "Table": "music", "Values": [ "1271799956" ], @@ -506,7 +474,6 @@ }, "FieldQuery": "select dt.c0 as content, dt.c1 as user_id, weight_string(dt.c0), weight_string(dt.c1) from (select content, user_id from music where 1 != 1) as dt(c0, c1) where 1 != 1", "Query": "select dt.c0 as content, dt.c1 as user_id, weight_string(dt.c0), weight_string(dt.c1) from (select distinct content, user_id from music where user_id = 1270637436 order by created_at asc, id asc limit 11) as dt(c0, c1)", - "Table": "music", "Values": [ "1270637436" ], @@ -521,7 +488,6 @@ }, "FieldQuery": "select dt.c0 as content, dt.c1 as user_id, weight_string(dt.c0), weight_string(dt.c1) from (select content, user_id from music where 1 != 1) as dt(c0, c1) where 1 != 1", "Query": "select dt.c0 as content, dt.c1 as user_id, weight_string(dt.c0), weight_string(dt.c1) from (select distinct content, user_id from music where user_id = 1271639345 order by created_at asc, id asc limit 11) as dt(c0, c1)", - "Table": "music", "Values": [ "1271639345" ], @@ -536,7 +502,6 @@ }, "FieldQuery": "select dt.c0 as content, dt.c1 as user_id, weight_string(dt.c0), weight_string(dt.c1) from (select content, user_id from music where 1 != 1) as dt(c0, c1) where 1 != 1", "Query": "select dt.c0 as content, dt.c1 as user_id, weight_string(dt.c0), weight_string(dt.c1) from (select distinct content, user_id from music where user_id = 1270644941 order by created_at asc, id asc limit 11) as dt(c0, c1)", - "Table": "music", "Values": [ "1270644941" ], @@ -551,7 +516,6 @@ }, "FieldQuery": "select dt.c0 as content, dt.c1 as user_id, weight_string(dt.c0), weight_string(dt.c1) from (select content, user_id from music where 1 != 1) as dt(c0, c1) where 1 != 1", "Query": "select dt.c0 as content, dt.c1 as user_id, weight_string(dt.c0), weight_string(dt.c1) from (select distinct content, user_id from music where user_id = 1270649256 order by created_at asc, id asc limit 11) as dt(c0, c1)", - "Table": "music", "Values": [ "1270649256" ], @@ -566,7 +530,6 @@ }, "FieldQuery": "select dt.c0 as content, dt.c1 as user_id, weight_string(dt.c0), weight_string(dt.c1) from (select content, user_id from music where 1 != 1) as dt(c0, c1) where 1 != 1", "Query": "select dt.c0 as content, dt.c1 as user_id, weight_string(dt.c0), weight_string(dt.c1) from (select distinct content, user_id from music where user_id = 1270653671 order by created_at asc, id asc limit 11) as dt(c0, c1)", - "Table": "music", "Values": [ "1270653671" ], @@ -581,7 +544,6 @@ }, "FieldQuery": "select dt.c0 as content, dt.c1 as user_id, weight_string(dt.c0), weight_string(dt.c1) from (select content, user_id from music where 1 != 1) as dt(c0, c1) where 1 != 1", "Query": "select dt.c0 as content, dt.c1 as user_id, weight_string(dt.c0), weight_string(dt.c1) from (select distinct content, user_id from music where user_id = 1270670201 order by created_at asc, id asc limit 11) as dt(c0, c1)", - "Table": "music", "Values": [ "1270670201" ], @@ -596,7 +558,6 @@ }, "FieldQuery": "select dt.c0 as content, dt.c1 as user_id, weight_string(dt.c0), weight_string(dt.c1) from (select content, user_id from music where 1 != 1) as dt(c0, c1) where 1 != 1", "Query": "select dt.c0 as content, dt.c1 as user_id, weight_string(dt.c0), weight_string(dt.c1) from (select distinct content, user_id from music where user_id = 1270717223 order by created_at asc, id asc limit 11) as dt(c0, c1)", - "Table": "music", "Values": [ "1270717223" ], @@ -611,7 +572,6 @@ }, "FieldQuery": "select dt.c0 as content, dt.c1 as user_id, weight_string(dt.c0), weight_string(dt.c1) from (select content, user_id from music where 1 != 1) as dt(c0, c1) where 1 != 1", "Query": "select dt.c0 as content, dt.c1 as user_id, weight_string(dt.c0), weight_string(dt.c1) from (select distinct content, user_id from music where user_id = 1270720898 order by created_at asc, id asc limit 11) as dt(c0, c1)", - "Table": "music", "Values": [ "1270720898" ], @@ -626,7 +586,6 @@ }, "FieldQuery": "select dt.c0 as content, dt.c1 as user_id, weight_string(dt.c0), weight_string(dt.c1) from (select content, user_id from music where 1 != 1) as dt(c0, c1) where 1 != 1", "Query": "select dt.c0 as content, dt.c1 as user_id, weight_string(dt.c0), weight_string(dt.c1) from (select distinct content, user_id from music where user_id = 1270982590 order by created_at asc, id asc limit 11) as dt(c0, c1)", - "Table": "music", "Values": [ "1270982590" ], @@ -641,7 +600,6 @@ }, "FieldQuery": "select dt.c0 as content, dt.c1 as user_id, weight_string(dt.c0), weight_string(dt.c1) from (select content, user_id from music where 1 != 1) as dt(c0, c1) where 1 != 1", "Query": "select dt.c0 as content, dt.c1 as user_id, weight_string(dt.c0), weight_string(dt.c1) from (select distinct content, user_id from music where user_id = 1271346411 order by created_at asc, id asc limit 11) as dt(c0, c1)", - "Table": "music", "Values": [ "1271346411" ], @@ -656,7 +614,6 @@ }, "FieldQuery": "select dt.c0 as content, dt.c1 as user_id, weight_string(dt.c0), weight_string(dt.c1) from (select content, user_id from music where 1 != 1) as dt(c0, c1) where 1 != 1", "Query": "select dt.c0 as content, dt.c1 as user_id, weight_string(dt.c0), weight_string(dt.c1) from (select distinct content, user_id from music where user_id = 1271352121 order by created_at asc, id asc limit 11) as dt(c0, c1)", - "Table": "music", "Values": [ "1271352121" ], @@ -671,7 +628,6 @@ }, "FieldQuery": "select dt.c0 as content, dt.c1 as user_id, weight_string(dt.c0), weight_string(dt.c1) from (select content, user_id from music where 1 != 1) as dt(c0, c1) where 1 != 1", "Query": "select dt.c0 as content, dt.c1 as user_id, weight_string(dt.c0), weight_string(dt.c1) from (select distinct content, user_id from music where user_id = 1271354908 order by created_at asc, id asc limit 11) as dt(c0, c1)", - "Table": "music", "Values": [ "1271354908" ], @@ -686,7 +642,6 @@ }, "FieldQuery": "select dt.c0 as content, dt.c1 as user_id, weight_string(dt.c0), weight_string(dt.c1) from (select content, user_id from music where 1 != 1) as dt(c0, c1) where 1 != 1", "Query": "select dt.c0 as content, dt.c1 as user_id, weight_string(dt.c0), weight_string(dt.c1) from (select distinct content, user_id from music where user_id = 1271365691 order by created_at asc, id asc limit 11) as dt(c0, c1)", - "Table": "music", "Values": [ "1271365691" ], @@ -701,7 +656,6 @@ }, "FieldQuery": "select dt.c0 as content, dt.c1 as user_id, weight_string(dt.c0), weight_string(dt.c1) from (select content, user_id from music where 1 != 1) as dt(c0, c1) where 1 != 1", "Query": "select dt.c0 as content, dt.c1 as user_id, weight_string(dt.c0), weight_string(dt.c1) from (select distinct content, user_id from music where user_id = 1271367516 order by created_at asc, id asc limit 11) as dt(c0, c1)", - "Table": "music", "Values": [ "1271367516" ], @@ -716,7 +670,6 @@ }, "FieldQuery": "select dt.c0 as content, dt.c1 as user_id, weight_string(dt.c0), weight_string(dt.c1) from (select content, user_id from music where 1 != 1) as dt(c0, c1) where 1 != 1", "Query": "select dt.c0 as content, dt.c1 as user_id, weight_string(dt.c0), weight_string(dt.c1) from (select distinct content, user_id from music where user_id = 1271472522 order by created_at asc, id asc limit 11) as dt(c0, c1)", - "Table": "music", "Values": [ "1271472522" ], @@ -731,7 +684,6 @@ }, "FieldQuery": "select dt.c0 as content, dt.c1 as user_id, weight_string(dt.c0), weight_string(dt.c1) from (select content, user_id from music where 1 != 1) as dt(c0, c1) where 1 != 1", "Query": "select dt.c0 as content, dt.c1 as user_id, weight_string(dt.c0), weight_string(dt.c1) from (select distinct content, user_id from music where user_id = 1271607757 order by created_at asc, id asc limit 11) as dt(c0, c1)", - "Table": "music", "Values": [ "1271607757" ], @@ -746,7 +698,6 @@ }, "FieldQuery": "select dt.c0 as content, dt.c1 as user_id, weight_string(dt.c0), weight_string(dt.c1) from (select content, user_id from music where 1 != 1) as dt(c0, c1) where 1 != 1", "Query": "select dt.c0 as content, dt.c1 as user_id, weight_string(dt.c0), weight_string(dt.c1) from (select distinct content, user_id from music where user_id = 1271639345 order by created_at asc, id asc limit 11) as dt(c0, c1)", - "Table": "music", "Values": [ "1271639345" ], @@ -761,7 +712,6 @@ }, "FieldQuery": "select dt.c0 as content, dt.c1 as user_id, weight_string(dt.c0), weight_string(dt.c1) from (select content, user_id from music where 1 != 1) as dt(c0, c1) where 1 != 1", "Query": "select dt.c0 as content, dt.c1 as user_id, weight_string(dt.c0), weight_string(dt.c1) from (select distinct content, user_id from music where user_id = 1271821733 order by created_at asc, id asc limit 11) as dt(c0, c1)", - "Table": "music", "Values": [ "1271821733" ], @@ -776,7 +726,6 @@ }, "FieldQuery": "select dt.c0 as content, dt.c1 as user_id, weight_string(dt.c0), weight_string(dt.c1) from (select content, user_id from music where 1 != 1) as dt(c0, c1) where 1 != 1", "Query": "select dt.c0 as content, dt.c1 as user_id, weight_string(dt.c0), weight_string(dt.c1) from (select distinct content, user_id from music where user_id = 1271914117 order by created_at asc, id asc limit 11) as dt(c0, c1)", - "Table": "music", "Values": [ "1271914117" ], @@ -791,7 +740,6 @@ }, "FieldQuery": "select dt.c0 as content, dt.c1 as user_id, weight_string(dt.c0), weight_string(dt.c1) from (select content, user_id from music where 1 != 1) as dt(c0, c1) where 1 != 1", "Query": "select dt.c0 as content, dt.c1 as user_id, weight_string(dt.c0), weight_string(dt.c1) from (select distinct content, user_id from music where user_id = 1272068709 order by created_at asc, id asc limit 11) as dt(c0, c1)", - "Table": "music", "Values": [ "1272068709" ], @@ -806,7 +754,6 @@ }, "FieldQuery": "select dt.c0 as content, dt.c1 as user_id, weight_string(dt.c0), weight_string(dt.c1) from (select content, user_id from music where 1 != 1) as dt(c0, c1) where 1 != 1", "Query": "select dt.c0 as content, dt.c1 as user_id, weight_string(dt.c0), weight_string(dt.c1) from (select distinct content, user_id from music where user_id = 1272127855 order by created_at asc, id asc limit 11) as dt(c0, c1)", - "Table": "music", "Values": [ "1272127855" ], @@ -821,7 +768,6 @@ }, "FieldQuery": "select dt.c0 as content, dt.c1 as user_id, weight_string(dt.c0), weight_string(dt.c1) from (select content, user_id from music where 1 != 1) as dt(c0, c1) where 1 != 1", "Query": "select dt.c0 as content, dt.c1 as user_id, weight_string(dt.c0), weight_string(dt.c1) from (select distinct content, user_id from music where user_id = 1272191137 order by created_at asc, id asc limit 11) as dt(c0, c1)", - "Table": "music", "Values": [ "1272191137" ], @@ -836,7 +782,6 @@ }, "FieldQuery": "select dt.c0 as content, dt.c1 as user_id, weight_string(dt.c0), weight_string(dt.c1) from (select content, user_id from music where 1 != 1) as dt(c0, c1) where 1 != 1", "Query": "select dt.c0 as content, dt.c1 as user_id, weight_string(dt.c0), weight_string(dt.c1) from (select distinct content, user_id from music where user_id = 1272244005 order by created_at asc, id asc limit 11) as dt(c0, c1)", - "Table": "music", "Values": [ "1272244005" ], @@ -851,7 +796,6 @@ }, "FieldQuery": "select dt.c0 as content, dt.c1 as user_id, weight_string(dt.c0), weight_string(dt.c1) from (select content, user_id from music where 1 != 1) as dt(c0, c1) where 1 != 1", "Query": "select dt.c0 as content, dt.c1 as user_id, weight_string(dt.c0), weight_string(dt.c1) from (select distinct content, user_id from music where user_id = 1272468271 order by created_at asc, id asc limit 11) as dt(c0, c1)", - "Table": "music", "Values": [ "1272468271" ], @@ -866,7 +810,6 @@ }, "FieldQuery": "select dt.c0 as content, dt.c1 as user_id, weight_string(dt.c0), weight_string(dt.c1) from (select content, user_id from music where 1 != 1) as dt(c0, c1) where 1 != 1", "Query": "select dt.c0 as content, dt.c1 as user_id, weight_string(dt.c0), weight_string(dt.c1) from (select distinct content, user_id from music where user_id = 1270982590 order by created_at asc, id asc limit 11) as dt(c0, c1)", - "Table": "music", "Values": [ "1270982590" ], @@ -881,7 +824,6 @@ }, "FieldQuery": "select dt.c0 as content, dt.c1 as user_id, weight_string(dt.c0), weight_string(dt.c1) from (select content, user_id from music where 1 != 1) as dt(c0, c1) where 1 != 1", "Query": "select dt.c0 as content, dt.c1 as user_id, weight_string(dt.c0), weight_string(dt.c1) from (select distinct content, user_id from music where user_id = 1271365691 order by created_at asc, id asc limit 11) as dt(c0, c1)", - "Table": "music", "Values": [ "1271365691" ], @@ -896,7 +838,6 @@ }, "FieldQuery": "select dt.c0 as content, dt.c1 as user_id, weight_string(dt.c0), weight_string(dt.c1) from (select content, user_id from music where 1 != 1) as dt(c0, c1) where 1 != 1", "Query": "select dt.c0 as content, dt.c1 as user_id, weight_string(dt.c0), weight_string(dt.c1) from (select distinct content, user_id from music where user_id = 1271607757 order by created_at asc, id asc limit 11) as dt(c0, c1)", - "Table": "music", "Values": [ "1271607757" ], @@ -911,7 +852,6 @@ }, "FieldQuery": "select dt.c0 as content, dt.c1 as user_id, weight_string(dt.c0), weight_string(dt.c1) from (select content, user_id from music where 1 != 1) as dt(c0, c1) where 1 != 1", "Query": "select dt.c0 as content, dt.c1 as user_id, weight_string(dt.c0), weight_string(dt.c1) from (select distinct content, user_id from music where user_id = 1270982590 order by created_at asc, id asc limit 11) as dt(c0, c1)", - "Table": "music", "Values": [ "1270982590" ], @@ -926,7 +866,6 @@ }, "FieldQuery": "select dt.c0 as content, dt.c1 as user_id, weight_string(dt.c0), weight_string(dt.c1) from (select content, user_id from music where 1 != 1) as dt(c0, c1) where 1 != 1", "Query": "select dt.c0 as content, dt.c1 as user_id, weight_string(dt.c0), weight_string(dt.c1) from (select distinct content, user_id from music where user_id = 1271365691 order by created_at asc, id asc limit 11) as dt(c0, c1)", - "Table": "music", "Values": [ "1271365691" ], @@ -941,7 +880,6 @@ }, "FieldQuery": "select dt.c0 as content, dt.c1 as user_id, weight_string(dt.c0), weight_string(dt.c1) from (select content, user_id from music where 1 != 1) as dt(c0, c1) where 1 != 1", "Query": "select dt.c0 as content, dt.c1 as user_id, weight_string(dt.c0), weight_string(dt.c1) from (select distinct content, user_id from music where user_id = 1271607757 order by created_at asc, id asc limit 11) as dt(c0, c1)", - "Table": "music", "Values": [ "1271607757" ], @@ -956,7 +894,6 @@ }, "FieldQuery": "select dt.c0 as content, dt.c1 as user_id, weight_string(dt.c0), weight_string(dt.c1) from (select content, user_id from music where 1 != 1) as dt(c0, c1) where 1 != 1", "Query": "select dt.c0 as content, dt.c1 as user_id, weight_string(dt.c0), weight_string(dt.c1) from (select distinct content, user_id from music where user_id = 1272244005 order by created_at asc, id asc limit 11) as dt(c0, c1)", - "Table": "music", "Values": [ "1272244005" ], diff --git a/go/vt/vtgate/planbuilder/testdata/lock_cases.json b/go/vt/vtgate/planbuilder/testdata/lock_cases.json index 9aa454ae43f..3e1f10c77ba 100644 --- a/go/vt/vtgate/planbuilder/testdata/lock_cases.json +++ b/go/vt/vtgate/planbuilder/testdata/lock_cases.json @@ -146,7 +146,6 @@ "JoinVars": { "u_foo": 2 }, - "TableName": "`user`_music", "Inputs": [ { "OperatorType": "Route", @@ -156,8 +155,7 @@ "Sharded": true }, "FieldQuery": "select u.col, u.bar, u.foo from `user` as u where 1 != 1", - "Query": "select u.col, u.bar, u.foo from `user` as u for update nowait", - "Table": "`user`" + "Query": "select u.col, u.bar, u.foo from `user` as u for update nowait" }, { "OperatorType": "Route", @@ -167,8 +165,7 @@ "Sharded": true }, "FieldQuery": "select 1 from music as m where 1 != 1", - "Query": "select 1 from music as m where m.foo = :u_foo for update nowait", - "Table": "music" + "Query": "select 1 from music as m where m.foo = :u_foo for update nowait" } ] }, @@ -192,7 +189,6 @@ "JoinVars": { "u_foo": 2 }, - "TableName": "`user`_music", "Inputs": [ { "OperatorType": "Route", @@ -202,8 +198,7 @@ "Sharded": true }, "FieldQuery": "select u.col, u.bar, u.foo from `user` as u where 1 != 1", - "Query": "select u.col, u.bar, u.foo from `user` as u for share skip locked", - "Table": "`user`" + "Query": "select u.col, u.bar, u.foo from `user` as u for share skip locked" }, { "OperatorType": "Route", @@ -213,8 +208,7 @@ "Sharded": true }, "FieldQuery": "select 1 from music as m where 1 != 1", - "Query": "select 1 from music as m where m.foo = :u_foo for share skip locked", - "Table": "music" + "Query": "select 1 from music as m where m.foo = :u_foo for share skip locked" } ] }, diff --git a/go/vt/vtgate/planbuilder/testdata/memory_sort_cases.json b/go/vt/vtgate/planbuilder/testdata/memory_sort_cases.json index a2d9c555135..d62fc32beab 100644 --- a/go/vt/vtgate/planbuilder/testdata/memory_sort_cases.json +++ b/go/vt/vtgate/planbuilder/testdata/memory_sort_cases.json @@ -27,8 +27,7 @@ }, "FieldQuery": "select dt.c0 as a, dt.c1 as b, dt.c2 as `count(*)`, dt.c3 as `weight_string(a)`, weight_string(dt.c1) from (select a, b, count(*), weight_string(a) from `user` where 1 != 1 group by a, weight_string(a)) as dt(c0, c1, c2, c3) where 1 != 1", "OrderBy": "(0|3) ASC", - "Query": "select dt.c0 as a, dt.c1 as b, dt.c2 as `count(*)`, dt.c3 as `weight_string(a)`, weight_string(dt.c1) from (select a, b, count(*), weight_string(a) from `user` group by a, weight_string(a) order by a asc) as dt(c0, c1, c2, c3)", - "Table": "`user`" + "Query": "select dt.c0 as a, dt.c1 as b, dt.c2 as `count(*)`, dt.c3 as `weight_string(a)`, weight_string(dt.c1) from (select a, b, count(*), weight_string(a) from `user` group by a, weight_string(a) order by a asc) as dt(c0, c1, c2, c3)" } ] } @@ -67,8 +66,7 @@ }, "FieldQuery": "select a, b, count(*) as k, weight_string(a) from `user` where 1 != 1 group by a, weight_string(a)", "OrderBy": "(0|3) ASC", - "Query": "select a, b, count(*) as k, weight_string(a) from `user` group by a, weight_string(a) order by a asc", - "Table": "`user`" + "Query": "select a, b, count(*) as k, weight_string(a) from `user` group by a, weight_string(a) order by a asc" } ] } @@ -107,8 +105,7 @@ }, "FieldQuery": "select dt.c0 as a, dt.c1 as b, dt.c2 as k, dt.c3 as `weight_string(a)`, weight_string(dt.c1) from (select a, b, count(*) as k, weight_string(a) from `user` where 1 != 1 group by a, weight_string(a)) as dt(c0, c1, c2, c3) where 1 != 1", "OrderBy": "(0|3) ASC", - "Query": "select dt.c0 as a, dt.c1 as b, dt.c2 as k, dt.c3 as `weight_string(a)`, weight_string(dt.c1) from (select a, b, count(*) as k, weight_string(a) from `user` group by a, weight_string(a) order by a asc) as dt(c0, c1, c2, c3)", - "Table": "`user`" + "Query": "select dt.c0 as a, dt.c1 as b, dt.c2 as k, dt.c3 as `weight_string(a)`, weight_string(dt.c1) from (select a, b, count(*) as k, weight_string(a) from `user` group by a, weight_string(a) order by a asc) as dt(c0, c1, c2, c3)" } ] } @@ -151,8 +148,7 @@ }, "FieldQuery": "select a, b, count(*) as k, weight_string(a) from `user` where 1 != 1 group by a, weight_string(a)", "OrderBy": "(0|3) ASC", - "Query": "select a, b, count(*) as k, weight_string(a) from `user` group by a, weight_string(a) order by a asc", - "Table": "`user`" + "Query": "select a, b, count(*) as k, weight_string(a) from `user` group by a, weight_string(a) order by a asc" } ] } @@ -193,8 +189,7 @@ }, "FieldQuery": "select a, b, count(*) as k, weight_string(a) from `user` where 1 != 1 group by a, weight_string(a)", "OrderBy": "(0|3) ASC", - "Query": "select a, b, count(*) as k, weight_string(a) from `user` group by a, weight_string(a) order by a asc", - "Table": "`user`" + "Query": "select a, b, count(*) as k, weight_string(a) from `user` group by a, weight_string(a) order by a asc" } ] } @@ -232,8 +227,7 @@ }, "FieldQuery": "select textcol1 as t, count(*) as k from `user` where 1 != 1 group by textcol1", "OrderBy": "0 ASC COLLATE latin1_swedish_ci", - "Query": "select textcol1 as t, count(*) as k from `user` group by textcol1 order by textcol1 asc", - "Table": "`user`" + "Query": "select textcol1 as t, count(*) as k from `user` group by textcol1 order by textcol1 asc" } ] } @@ -255,7 +249,6 @@ "OperatorType": "Join", "Variant": "Join", "JoinColumnIndexes": "L:0", - "TableName": "`user`_user_extra", "Inputs": [ { "OperatorType": "Route", @@ -266,8 +259,7 @@ }, "FieldQuery": "select t.id, t.col, weight_string(t.id) from (select `user`.id, `user`.col from `user` where 1 != 1) as t where 1 != 1", "OrderBy": "(0|2) ASC", - "Query": "select t.id, t.col, weight_string(t.id) from (select `user`.id, `user`.col from `user`) as t order by t.id asc", - "Table": "`user`" + "Query": "select t.id, t.col, weight_string(t.id) from (select `user`.id, `user`.col from `user`) as t order by t.id asc" }, { "OperatorType": "Route", @@ -277,8 +269,7 @@ "Sharded": true }, "FieldQuery": "select 1 from user_extra where 1 != 1", - "Query": "select 1 from user_extra", - "Table": "user_extra" + "Query": "select 1 from user_extra" } ] }, @@ -308,7 +299,6 @@ "JoinVars": { "user_id": 2 }, - "TableName": "`user`_music", "Inputs": [ { "OperatorType": "Route", @@ -319,7 +309,6 @@ }, "FieldQuery": "select `user`.col1 as a, `user`.col2 as b, `user`.id from `user` where 1 != 1", "Query": "select `user`.col1 as a, `user`.col2 as b, `user`.id from `user` where `user`.id = 1", - "Table": "`user`", "Values": [ "1" ], @@ -346,7 +335,6 @@ }, "FieldQuery": "select `name`, keyspace_id from name_user_vdx where 1 != 1", "Query": "select `name`, keyspace_id from name_user_vdx where `name` in ::__vals", - "Table": "name_user_vdx", "Values": [ "::name" ], @@ -360,8 +348,7 @@ "Sharded": true }, "FieldQuery": "select music.col3 as c, weight_string(music.col3) from music where 1 != 1", - "Query": "select music.col3 as c, weight_string(music.col3) from music where music.id = :user_id", - "Table": "music" + "Query": "select music.col3 as c, weight_string(music.col3) from music where music.id = :user_id" } ] } @@ -395,7 +382,6 @@ "JoinVars": { "user_id": 2 }, - "TableName": "`user`_music", "Inputs": [ { "OperatorType": "Route", @@ -406,7 +392,6 @@ }, "FieldQuery": "select `user`.col1 as a, `user`.col2, `user`.id, weight_string(`user`.col1), weight_string(`user`.col2) from `user` where 1 != 1", "Query": "select `user`.col1 as a, `user`.col2, `user`.id, weight_string(`user`.col1), weight_string(`user`.col2) from `user` where `user`.id = 1", - "Table": "`user`", "Values": [ "1" ], @@ -433,7 +418,6 @@ }, "FieldQuery": "select `name`, keyspace_id from name_user_vdx where 1 != 1", "Query": "select `name`, keyspace_id from name_user_vdx where `name` in ::__vals", - "Table": "name_user_vdx", "Values": [ "::name" ], @@ -447,8 +431,7 @@ "Sharded": true }, "FieldQuery": "select music.col3, weight_string(music.col3) from music where 1 != 1", - "Query": "select music.col3, weight_string(music.col3) from music where music.id = :user_id", - "Table": "music" + "Query": "select music.col3, weight_string(music.col3) from music where music.id = :user_id" } ] } @@ -479,7 +462,6 @@ "OperatorType": "Join", "Variant": "Join", "JoinColumnIndexes": "L:0,L:1,R:0,R:1", - "TableName": "`user`_unsharded", "Inputs": [ { "OperatorType": "Route", @@ -489,8 +471,7 @@ "Sharded": true }, "FieldQuery": "select u.a, u.textcol1 from `user` as u where 1 != 1", - "Query": "select u.a, u.textcol1 from `user` as u", - "Table": "`user`" + "Query": "select u.a, u.textcol1 from `user` as u" }, { "OperatorType": "Route", @@ -500,8 +481,7 @@ "Sharded": false }, "FieldQuery": "select un.col2, weight_string(un.col2) from unsharded as un where 1 != 1", - "Query": "select un.col2, weight_string(un.col2) from unsharded as un", - "Table": "unsharded" + "Query": "select un.col2, weight_string(un.col2) from unsharded as un" } ] } @@ -530,7 +510,6 @@ "OperatorType": "Join", "Variant": "Join", "JoinColumnIndexes": "R:0,R:1,L:0,L:1", - "TableName": "unsharded_`user`", "Inputs": [ { "OperatorType": "Route", @@ -540,8 +519,7 @@ "Sharded": false }, "FieldQuery": "select un.col2, weight_string(un.col2) from unsharded as un where 1 != 1", - "Query": "select un.col2, weight_string(un.col2) from unsharded as un", - "Table": "unsharded" + "Query": "select un.col2, weight_string(un.col2) from unsharded as un" }, { "OperatorType": "Route", @@ -551,8 +529,7 @@ "Sharded": true }, "FieldQuery": "select u.a, u.textcol1 from `user` as u where 1 != 1", - "Query": "select u.a, u.textcol1 from `user` as u", - "Table": "`user`" + "Query": "select u.a, u.textcol1 from `user` as u" } ] } @@ -618,8 +595,7 @@ "FieldQuery": "select a, convert(`user`.a, binary), weight_string(convert(`user`.a, binary)) from `user` where 1 != 1", "OrderBy": "(1|2) DESC", "Query": "select a, convert(`user`.a, binary), weight_string(convert(`user`.a, binary)) from `user` order by convert(`user`.a, binary) desc", - "ResultColumns": 1, - "Table": "`user`" + "ResultColumns": 1 }, "TablesUsed": [ "user.user" @@ -640,7 +616,6 @@ "JoinVars": { "u_a": 0 }, - "TableName": "`user`_music", "Inputs": [ { "OperatorType": "Route", @@ -651,8 +626,7 @@ }, "FieldQuery": "select u.a, convert(u.a, binary), weight_string(convert(u.a, binary)) from `user` as u where 1 != 1", "OrderBy": "(1|2) DESC", - "Query": "select u.a, convert(u.a, binary), weight_string(convert(u.a, binary)) from `user` as u order by convert(u.a, binary) desc", - "Table": "`user`" + "Query": "select u.a, convert(u.a, binary), weight_string(convert(u.a, binary)) from `user` as u order by convert(u.a, binary) desc" }, { "OperatorType": "Route", @@ -662,8 +636,7 @@ "Sharded": true }, "FieldQuery": "select 1 from music as m where 1 != 1", - "Query": "select 1 from music as m where m.a = :u_a", - "Table": "music" + "Query": "select 1 from music as m where m.a = :u_a" } ] }, @@ -689,8 +662,7 @@ }, "FieldQuery": "select id, intcol from `user` where 1 != 1", "OrderBy": "1 ASC", - "Query": "select id, intcol from `user` order by `user`.intcol asc", - "Table": "`user`" + "Query": "select id, intcol from `user` order by `user`.intcol asc" }, "TablesUsed": [ "user.user" @@ -714,8 +686,7 @@ "FieldQuery": "select col, id, weight_string(id) from `user` where 1 != 1", "OrderBy": "(1|2) ASC", "Query": "select col, id, weight_string(id) from `user` order by id asc", - "ResultColumns": 1, - "Table": "`user`" + "ResultColumns": 1 }, "TablesUsed": [ "user.user" @@ -739,7 +710,6 @@ "OperatorType": "Join", "Variant": "Join", "JoinColumnIndexes": "L:0,R:0,R:1,L:1", - "TableName": "`user`_user_extra", "Inputs": [ { "OperatorType": "Route", @@ -749,8 +719,7 @@ "Sharded": true }, "FieldQuery": "select tbl.foo, weight_string(tbl.foo) from (select u.foo from `user` as u where 1 != 1) as tbl where 1 != 1", - "Query": "select tbl.foo, weight_string(tbl.foo) from (select u.foo from `user` as u) as tbl", - "Table": "`user`" + "Query": "select tbl.foo, weight_string(tbl.foo) from (select u.foo from `user` as u) as tbl" }, { "OperatorType": "Route", @@ -760,8 +729,7 @@ "Sharded": true }, "FieldQuery": "select tbl.bar, weight_string(tbl.bar) from (select ue.bar from user_extra as ue where 1 != 1) as tbl where 1 != 1", - "Query": "select tbl.bar, weight_string(tbl.bar) from (select ue.bar from user_extra as ue) as tbl", - "Table": "user_extra" + "Query": "select tbl.bar, weight_string(tbl.bar) from (select ue.bar from user_extra as ue) as tbl" } ] } diff --git a/go/vt/vtgate/planbuilder/testdata/mirror_cases.json b/go/vt/vtgate/planbuilder/testdata/mirror_cases.json index be292b7cb72..23f88e3d673 100644 --- a/go/vt/vtgate/planbuilder/testdata/mirror_cases.json +++ b/go/vt/vtgate/planbuilder/testdata/mirror_cases.json @@ -19,8 +19,7 @@ "Sharded": false }, "FieldQuery": "select t1.id from t1 where 1 != 1", - "Query": "select t1.id from t1 where t1.id = 1", - "Table": "t1" + "Query": "select t1.id from t1 where t1.id = 1" }, { "OperatorType": "Route", @@ -30,8 +29,7 @@ "Sharded": false }, "FieldQuery": "select t1.id from t1 where 1 != 1", - "Query": "select t1.id from t1 where t1.id = 1", - "Table": "t1" + "Query": "select t1.id from t1 where t1.id = 1" } ] }, @@ -61,8 +59,7 @@ "Sharded": false }, "FieldQuery": "select t4.id from t4 where 1 != 1", - "Query": "select t4.id from t4 where t4.id = 1", - "Table": "t4" + "Query": "select t4.id from t4 where t4.id = 1" }, { "OperatorType": "Route", @@ -72,8 +69,7 @@ "Sharded": false }, "FieldQuery": "select t4.id from t4 where 1 != 1", - "Query": "select t4.id from t4 where t4.id = 1", - "Table": "t4" + "Query": "select t4.id from t4 where t4.id = 1" } ] }, @@ -103,8 +99,7 @@ "Sharded": false }, "FieldQuery": "select t4.id from t4 where 1 != 1", - "Query": "select t4.id from t4 where t4.id = 1", - "Table": "t4" + "Query": "select t4.id from t4 where t4.id = 1" }, { "OperatorType": "Route", @@ -114,8 +109,7 @@ "Sharded": false }, "FieldQuery": "select t4.id from t4 where 1 != 1", - "Query": "select t4.id from t4 where t4.id = 1", - "Table": "t4" + "Query": "select t4.id from t4 where t4.id = 1" } ] }, @@ -145,8 +139,7 @@ "Sharded": false }, "FieldQuery": "select t4.id from t4 where 1 != 1", - "Query": "select t4.id from t4 where t4.id = 1", - "Table": "t4" + "Query": "select t4.id from t4 where t4.id = 1" }, { "OperatorType": "Route", @@ -156,8 +149,7 @@ "Sharded": false }, "FieldQuery": "select t4.id from t4 where 1 != 1", - "Query": "select t4.id from t4 where t4.id = 1", - "Table": "t4" + "Query": "select t4.id from t4 where t4.id = 1" } ] }, @@ -182,8 +174,7 @@ "Sharded": false }, "FieldQuery": "select t3.id from t3 where 1 != 1", - "Query": "select t3.id from t3 where t3.id = 1", - "Table": "t3" + "Query": "select t3.id from t3 where t3.id = 1" }, "TablesUsed": [ "unsharded_src1.t3" @@ -210,8 +201,7 @@ "Sharded": false }, "FieldQuery": "select t2.id from t2 where 1 != 1", - "Query": "select t2.id from t2 where t2.id = 1", - "Table": "t2" + "Query": "select t2.id from t2 where t2.id = 1" }, { "OperatorType": "Route", @@ -222,7 +212,6 @@ }, "FieldQuery": "select t2.id from t1 as t2 where 1 != 1", "Query": "select t2.id from t1 as t2 where t2.id = 1", - "Table": "t1", "Values": [ "1" ], @@ -256,8 +245,7 @@ "Sharded": false }, "FieldQuery": "select t1.id, t2.id from t1, t2 where 1 != 1", - "Query": "select t1.id, t2.id from t1, t2 where t1.id = t2.id", - "Table": "t1, t2" + "Query": "select t1.id, t2.id from t1, t2 where t1.id = t2.id" }, { "OperatorType": "Join", @@ -266,7 +254,6 @@ "JoinVars": { "t1_id1": 0 }, - "TableName": "t1_t1", "Inputs": [ { "OperatorType": "Route", @@ -276,8 +263,7 @@ "Sharded": false }, "FieldQuery": "select t1.id from t1 where 1 != 1", - "Query": "select t1.id from t1", - "Table": "t1" + "Query": "select t1.id from t1" }, { "OperatorType": "Route", @@ -288,7 +274,6 @@ }, "FieldQuery": "select t2.id from t1 as t2 where 1 != 1", "Query": "select t2.id from t1 as t2 where t2.id = :t1_id1", - "Table": "t1", "Values": [ ":t1_id1" ], @@ -326,8 +311,7 @@ "Sharded": false }, "FieldQuery": "select t1.id from t1 where 1 != 1 union select t2.id from t2 where 1 != 1", - "Query": "select t1.id from t1 union select t2.id from t2", - "Table": "t1, t2" + "Query": "select t1.id from t1 union select t2.id from t2" }, { "OperatorType": "Distinct", @@ -346,8 +330,7 @@ "Sharded": false }, "FieldQuery": "select dt.c0 as id, weight_string(dt.c0) from (select t1.id from t1 where 1 != 1) as dt(c0) where 1 != 1", - "Query": "select dt.c0 as id, weight_string(dt.c0) from (select distinct t1.id from t1) as dt(c0)", - "Table": "t1" + "Query": "select dt.c0 as id, weight_string(dt.c0) from (select distinct t1.id from t1) as dt(c0)" }, { "OperatorType": "Route", @@ -357,8 +340,7 @@ "Sharded": true }, "FieldQuery": "select dt.c0 as id, weight_string(dt.c0) from (select t2.id from t1 as t2 where 1 != 1) as dt(c0) where 1 != 1", - "Query": "select dt.c0 as id, weight_string(dt.c0) from (select distinct t2.id from t1 as t2) as dt(c0)", - "Table": "t1" + "Query": "select dt.c0 as id, weight_string(dt.c0) from (select distinct t2.id from t1 as t2) as dt(c0)" } ] } @@ -388,8 +370,7 @@ "Name": "unsharded_src1", "Sharded": false }, - "Query": "insert into t1(id) values (1)", - "TableName": "t1" + "Query": "insert into t1(id) values (1)" }, "TablesUsed": [ "unsharded_src1.t1" @@ -410,8 +391,7 @@ "Name": "unsharded_src1", "Sharded": false }, - "Query": "update t1 set `data` = 'a' where id = 1", - "Table": "t1" + "Query": "update t1 set `data` = 'a' where id = 1" }, "TablesUsed": [ "unsharded_src1.t1" @@ -432,8 +412,7 @@ "Name": "unsharded_src1", "Sharded": false }, - "Query": "delete from t1 where id = 1", - "Table": "t1" + "Query": "delete from t1 where id = 1" }, "TablesUsed": [ "unsharded_src1.t1" @@ -455,8 +434,7 @@ "Sharded": false }, "FieldQuery": "select t1.id from t1 where 1 != 1", - "Query": "select t1.id from t1", - "Table": "t1" + "Query": "select t1.id from t1" }, "TablesUsed": [ "unsharded_src2.t1" @@ -483,8 +461,7 @@ "Sharded": false }, "FieldQuery": "select t2.id from t2 where 1 != 1", - "Query": "select t2.id from t2", - "Table": "t2" + "Query": "select t2.id from t2" }, { "OperatorType": "Route", @@ -494,8 +471,7 @@ "Sharded": false }, "FieldQuery": "select t2.id from t2 where 1 != 1", - "Query": "select t2.id from t2", - "Table": "t2" + "Query": "select t2.id from t2" } ] }, @@ -520,8 +496,7 @@ "Sharded": false }, "FieldQuery": "select t1.id from t1 where 1 != 1", - "Query": "select t1.id from t1", - "Table": "t1" + "Query": "select t1.id from t1" }, "TablesUsed": [ "unsharded_src3.t1" diff --git a/go/vt/vtgate/planbuilder/testdata/misc_cases.json b/go/vt/vtgate/planbuilder/testdata/misc_cases.json index 709b61636ca..c21ce22a5a0 100644 --- a/go/vt/vtgate/planbuilder/testdata/misc_cases.json +++ b/go/vt/vtgate/planbuilder/testdata/misc_cases.json @@ -91,7 +91,6 @@ }, "FieldQuery": "select 1 from `user` where 1 != 1", "Query": "select 1 from `user` where id = :v1", - "Table": "`user`", "Values": [ ":v1" ], @@ -127,7 +126,6 @@ }, "FieldQuery": "select 1 from `user` where 1 != 1", "Query": "select 1 from `user` where id in ::__vals", - "Table": "`user`", "Values": [ "(:v1, :v2)" ], @@ -159,8 +157,7 @@ "Sharded": true }, "FieldQuery": "select 1 from `user` where 1 != 1", - "Query": "select 1 from `user`", - "Table": "`user`" + "Query": "select 1 from `user`" } ] }, diff --git a/go/vt/vtgate/planbuilder/testdata/oltp_cases.json b/go/vt/vtgate/planbuilder/testdata/oltp_cases.json index 8db0ef3cafb..8d154fee68c 100644 --- a/go/vt/vtgate/planbuilder/testdata/oltp_cases.json +++ b/go/vt/vtgate/planbuilder/testdata/oltp_cases.json @@ -15,7 +15,6 @@ }, "FieldQuery": "select c from sbtest34 where 1 != 1", "Query": "select c from sbtest34 where id = 15", - "Table": "sbtest34", "Values": [ "15" ], @@ -41,8 +40,7 @@ "Sharded": true }, "FieldQuery": "select c from sbtest12 where 1 != 1", - "Query": "select c from sbtest12 where id between 1 and 10", - "Table": "sbtest12" + "Query": "select c from sbtest12 where id between 1 and 10" }, "TablesUsed": [ "main.sbtest12" @@ -69,8 +67,7 @@ "Sharded": true }, "FieldQuery": "select sum(k) from sbtest43 where 1 != 1", - "Query": "select sum(k) from sbtest43 where id between 90 and 990", - "Table": "sbtest43" + "Query": "select sum(k) from sbtest43 where id between 90 and 990" } ] }, @@ -95,8 +92,7 @@ }, "FieldQuery": "select c from sbtest1 where 1 != 1", "OrderBy": "0 ASC COLLATE latin1_swedish_ci", - "Query": "select c from sbtest1 where id between 50 and 235 order by sbtest1.c asc", - "Table": "sbtest1" + "Query": "select c from sbtest1 where id between 50 and 235 order by sbtest1.c asc" }, "TablesUsed": [ "main.sbtest1" @@ -124,8 +120,7 @@ }, "FieldQuery": "select c from sbtest30 where 1 != 1 group by c", "OrderBy": "0 ASC COLLATE latin1_swedish_ci", - "Query": "select c from sbtest30 where id between 1 and 10 group by c order by sbtest30.c asc", - "Table": "sbtest30" + "Query": "select c from sbtest30 where id between 1 and 10 group by c order by sbtest30.c asc" } ] }, @@ -149,7 +144,6 @@ "Sharded": true }, "Query": "update sbtest6 set k = k + 1 where id = 5", - "Table": "sbtest6", "Values": [ "5" ], @@ -175,7 +169,6 @@ "Sharded": true }, "Query": "update sbtest9 set c = 7 where id = 8", - "Table": "sbtest9", "Values": [ "8" ], @@ -201,7 +194,6 @@ "Sharded": true }, "Query": "delete from sbtest15 where id = 7525", - "Table": "sbtest15", "Values": [ "7525" ], @@ -227,7 +219,6 @@ "Sharded": true }, "Query": "insert into sbtest16(id, k, c, pad) values (:_id_0, 1, 2, 50)", - "TableName": "sbtest16", "VindexValues": { "hash": "42" } diff --git a/go/vt/vtgate/planbuilder/testdata/postprocess_cases.json b/go/vt/vtgate/planbuilder/testdata/postprocess_cases.json index e515c165fe0..ac9ba186729 100644 --- a/go/vt/vtgate/planbuilder/testdata/postprocess_cases.json +++ b/go/vt/vtgate/planbuilder/testdata/postprocess_cases.json @@ -14,8 +14,7 @@ "Sharded": true }, "FieldQuery": "select `user`.col1 from `user` where 1 != 1", - "Query": "select `user`.col1 from `user` where col2 = 2", - "Table": "`user`" + "Query": "select `user`.col1 from `user` where col2 = 2" }, "TablesUsed": [ "user.user" @@ -38,7 +37,6 @@ "OperatorType": "Join", "Variant": "Join", "JoinColumnIndexes": "L:0,R:0", - "TableName": "`user`_user_extra", "Inputs": [ { "OperatorType": "Route", @@ -48,8 +46,7 @@ "Sharded": true }, "FieldQuery": "select `user`.col1 from `user` where 1 != 1", - "Query": "select `user`.col1 from `user`", - "Table": "`user`" + "Query": "select `user`.col1 from `user`" }, { "OperatorType": "Route", @@ -59,8 +56,7 @@ "Sharded": true }, "FieldQuery": "select user_extra.col1 from user_extra where 1 != 1", - "Query": "select user_extra.col1 from user_extra where user_extra.col1 = 2", - "Table": "user_extra" + "Query": "select user_extra.col1 from user_extra where user_extra.col1 = 2" } ] }, @@ -81,7 +77,6 @@ "OperatorType": "Join", "Variant": "Join", "JoinColumnIndexes": "L:0,L:1,R:0", - "TableName": "`user`_user_extra", "Inputs": [ { "OperatorType": "Route", @@ -91,8 +86,7 @@ "Sharded": true }, "FieldQuery": "select `user`.col1 as a, `user`.col2 from `user` where 1 != 1", - "Query": "select `user`.col1 as a, `user`.col2 from `user` where `user`.col1 = 1 and `user`.col1 = `user`.col2", - "Table": "`user`" + "Query": "select `user`.col1 as a, `user`.col2 from `user` where `user`.col1 = 1 and `user`.col1 = `user`.col2" }, { "OperatorType": "Route", @@ -102,8 +96,7 @@ "Sharded": true }, "FieldQuery": "select user_extra.col3 from user_extra where 1 != 1", - "Query": "select user_extra.col3 from user_extra where user_extra.col3 = 1", - "Table": "user_extra" + "Query": "select user_extra.col3 from user_extra where user_extra.col3 = 1" } ] }, @@ -137,8 +130,7 @@ "Sharded": true }, "FieldQuery": "select col from `user` where 1 != 1", - "Query": "select col from `user`", - "Table": "`user`" + "Query": "select col from `user`" }, { "InputName": "Outer", @@ -150,7 +142,6 @@ }, "FieldQuery": "select id from `user` where 1 != 1", "Query": "select id from `user` where :__sq_has_values and `user`.id in ::__vals", - "Table": "`user`", "Values": [ "::__sq1" ], @@ -179,7 +170,6 @@ }, "FieldQuery": "select col from `user` where 1 != 1", "Query": "select col from `user` where id = 5 order by aa asc", - "Table": "`user`", "Values": [ "5" ], @@ -206,7 +196,6 @@ }, "FieldQuery": "select col from `user` where 1 != 1", "Query": "select col from `user` where id = 1 order by col asc", - "Table": "`user`", "Values": [ "1" ], @@ -233,8 +222,7 @@ }, "FieldQuery": "select col from `user` where 1 != 1", "OrderBy": "0 ASC", - "Query": "select col from `user` order by `user`.col asc", - "Table": "`user`" + "Query": "select col from `user` order by `user`.col asc" }, "TablesUsed": [ "user.user" @@ -258,8 +246,7 @@ "FieldQuery": "select user_id, col1, col2, weight_string(user_id) from authoritative where 1 != 1", "OrderBy": "(0|3) ASC", "Query": "select user_id, col1, col2, weight_string(user_id) from authoritative order by authoritative.user_id asc", - "ResultColumns": 3, - "Table": "authoritative" + "ResultColumns": 3 }, "TablesUsed": [ "user.authoritative" @@ -284,7 +271,6 @@ "JoinVars": { "user_c": 0 }, - "TableName": "`user`_user_extra", "Inputs": [ { "OperatorType": "Limit", @@ -298,8 +284,7 @@ "Sharded": true }, "FieldQuery": "select `user`.c from `user` where 1 != 1", - "Query": "select `user`.c from `user` where `user`.a = 1 limit 1", - "Table": "`user`" + "Query": "select `user`.c from `user` where `user`.a = 1 limit 1" } ] }, @@ -315,8 +300,7 @@ "Sharded": true }, "FieldQuery": "select user_extra.id from user_extra where 1 != 1", - "Query": "select user_extra.id from user_extra where user_extra.c = :user_c and user_extra.b = 2 limit 1", - "Table": "user_extra" + "Query": "select user_extra.id from user_extra where user_extra.c = :user_c and user_extra.b = 2 limit 1" } ] } @@ -346,8 +330,7 @@ }, "FieldQuery": "select user_id, col1, col2 from authoritative where 1 != 1", "OrderBy": "1 ASC COLLATE latin1_swedish_ci", - "Query": "select user_id, col1, col2 from authoritative order by authoritative.col1 asc", - "Table": "authoritative" + "Query": "select user_id, col1, col2 from authoritative order by authoritative.col1 asc" }, "TablesUsed": [ "user.authoritative" @@ -371,8 +354,7 @@ "FieldQuery": "select a, textcol1, b, weight_string(a), weight_string(b) from `user` where 1 != 1", "OrderBy": "(0|3) ASC, 1 ASC COLLATE latin1_swedish_ci, (2|4) ASC", "Query": "select a, textcol1, b, weight_string(a), weight_string(b) from `user` order by `user`.a asc, `user`.textcol1 asc, `user`.b asc", - "ResultColumns": 3, - "Table": "`user`" + "ResultColumns": 3 }, "TablesUsed": [ "user.user" @@ -396,8 +378,7 @@ "FieldQuery": "select a, `user`.textcol1, b, weight_string(a), weight_string(b) from `user` where 1 != 1", "OrderBy": "(0|3) ASC, 1 ASC COLLATE latin1_swedish_ci, (2|4) ASC", "Query": "select a, `user`.textcol1, b, weight_string(a), weight_string(b) from `user` order by `user`.a asc, `user`.textcol1 asc, `user`.b asc", - "ResultColumns": 3, - "Table": "`user`" + "ResultColumns": 3 }, "TablesUsed": [ "user.user" @@ -421,8 +402,7 @@ "FieldQuery": "select a, textcol1, b, textcol2, weight_string(a), weight_string(b), weight_string(textcol2) from `user` where 1 != 1", "OrderBy": "(0|4) ASC, 1 ASC COLLATE latin1_swedish_ci, (2|5) ASC, (3|6) ASC COLLATE ", "Query": "select a, textcol1, b, textcol2, weight_string(a), weight_string(b), weight_string(textcol2) from `user` order by `user`.a asc, `user`.textcol1 asc, `user`.b asc, `user`.textcol2 asc", - "ResultColumns": 4, - "Table": "`user`" + "ResultColumns": 4 }, "TablesUsed": [ "user.user" @@ -451,8 +431,7 @@ "FieldQuery": "select id as foo, weight_string(id) from music where 1 != 1", "OrderBy": "(0|1) ASC", "Query": "select id as foo, weight_string(id) from music order by id asc", - "ResultColumns": 1, - "Table": "music" + "ResultColumns": 1 }, "TablesUsed": [ "user.music" @@ -474,8 +453,7 @@ "Sharded": true }, "FieldQuery": "select col from `user` where 1 != 1", - "Query": "select col from `user` order by null", - "Table": "`user`" + "Query": "select col from `user` order by null" }, "TablesUsed": [ "user.user" @@ -506,8 +484,7 @@ "Sharded": true }, "FieldQuery": "select col2 from `user` where 1 != 1", - "Query": "select col2 from `user`", - "Table": "`user`" + "Query": "select col2 from `user`" }, { "InputName": "Outer", @@ -519,8 +496,7 @@ }, "FieldQuery": "select col from `user` where 1 != 1", "OrderBy": "0 ASC", - "Query": "select col from `user` where :__sq_has_values and col in ::__sq1 order by `user`.col asc", - "Table": "`user`" + "Query": "select col from `user` where :__sq_has_values and col in ::__sq1 order by `user`.col asc" } ] }, @@ -543,7 +519,6 @@ "JoinVars": { "user_id": 2 }, - "TableName": "`user`_music", "Inputs": [ { "OperatorType": "Route", @@ -554,7 +529,6 @@ }, "FieldQuery": "select `user`.col1 as a, `user`.col2, `user`.id from `user` where 1 != 1", "Query": "select `user`.col1 as a, `user`.col2, `user`.id from `user` where `user`.id = 1", - "Table": "`user`", "Values": [ "1" ], @@ -581,7 +555,6 @@ }, "FieldQuery": "select `name`, keyspace_id from name_user_vdx where 1 != 1", "Query": "select `name`, keyspace_id from name_user_vdx where `name` in ::__vals", - "Table": "name_user_vdx", "Values": [ "::name" ], @@ -595,8 +568,7 @@ "Sharded": true }, "FieldQuery": "select music.col3 from music where 1 != 1", - "Query": "select music.col3 from music where music.id = :user_id", - "Table": "music" + "Query": "select music.col3 from music where music.id = :user_id" } ] } @@ -622,7 +594,6 @@ "JoinVars": { "user_id": 2 }, - "TableName": "`user`_music", "Inputs": [ { "OperatorType": "Route", @@ -633,7 +604,6 @@ }, "FieldQuery": "select `user`.col1 as a, `user`.col2, `user`.id from `user` where 1 != 1", "Query": "select `user`.col1 as a, `user`.col2, `user`.id from `user` where `user`.id = 1 order by `user`.col1 asc", - "Table": "`user`", "Values": [ "1" ], @@ -660,7 +630,6 @@ }, "FieldQuery": "select `name`, keyspace_id from name_user_vdx where 1 != 1", "Query": "select `name`, keyspace_id from name_user_vdx where `name` in ::__vals", - "Table": "name_user_vdx", "Values": [ "::name" ], @@ -674,8 +643,7 @@ "Sharded": true }, "FieldQuery": "select music.col3 from music where 1 != 1", - "Query": "select music.col3 from music where music.id = :user_id", - "Table": "music" + "Query": "select music.col3 from music where music.id = :user_id" } ] } @@ -701,7 +669,6 @@ "JoinVars": { "user_id": 2 }, - "TableName": "`user`_music", "Inputs": [ { "OperatorType": "Route", @@ -712,7 +679,6 @@ }, "FieldQuery": "select `user`.col1 as a, `user`.col2, `user`.id from `user` where 1 != 1", "Query": "select `user`.col1 as a, `user`.col2, `user`.id from `user` where `user`.id = 1 order by `user`.col1 asc", - "Table": "`user`", "Values": [ "1" ], @@ -739,7 +705,6 @@ }, "FieldQuery": "select `name`, keyspace_id from name_user_vdx where 1 != 1", "Query": "select `name`, keyspace_id from name_user_vdx where `name` in ::__vals", - "Table": "name_user_vdx", "Values": [ "::name" ], @@ -753,8 +718,7 @@ "Sharded": true }, "FieldQuery": "select music.col3 from music where 1 != 1", - "Query": "select music.col3 from music where music.id = :user_id", - "Table": "music" + "Query": "select music.col3 from music where music.id = :user_id" } ] } @@ -790,8 +754,7 @@ "Sharded": true }, "FieldQuery": "select col2 from `user` where 1 != 1", - "Query": "select col2 from `user`", - "Table": "`user`" + "Query": "select col2 from `user`" }, { "InputName": "Outer", @@ -802,8 +765,7 @@ "Sharded": true }, "FieldQuery": "select col from `user` where 1 != 1", - "Query": "select col from `user` where :__sq_has_values and col in ::__sq1", - "Table": "`user`" + "Query": "select col from `user` where :__sq_has_values and col in ::__sq1" } ] }, @@ -827,8 +789,7 @@ "Sharded": true }, "FieldQuery": "select col from `user` where 1 != 1", - "Query": "select col from `user` order by RAND()", - "Table": "`user`" + "Query": "select col from `user` order by RAND()" }, "TablesUsed": [ "user.user" @@ -849,7 +810,6 @@ "JoinVars": { "user_id": 2 }, - "TableName": "`user`_music", "Inputs": [ { "OperatorType": "Route", @@ -860,7 +820,6 @@ }, "FieldQuery": "select `user`.col1 as a, `user`.col2, `user`.id from `user` where 1 != 1", "Query": "select `user`.col1 as a, `user`.col2, `user`.id from `user` where `user`.id = 1 order by RAND()", - "Table": "`user`", "Values": [ "1" ], @@ -887,7 +846,6 @@ }, "FieldQuery": "select `name`, keyspace_id from name_user_vdx where 1 != 1", "Query": "select `name`, keyspace_id from name_user_vdx where `name` in ::__vals", - "Table": "name_user_vdx", "Values": [ "::name" ], @@ -901,8 +859,7 @@ "Sharded": true }, "FieldQuery": "select music.col3 from music where 1 != 1", - "Query": "select music.col3 from music where music.id = :user_id", - "Table": "music" + "Query": "select music.col3 from music where music.id = :user_id" } ] } @@ -938,8 +895,7 @@ "Sharded": true }, "FieldQuery": "select col2 from `user` where 1 != 1", - "Query": "select col2 from `user`", - "Table": "`user`" + "Query": "select col2 from `user`" }, { "InputName": "Outer", @@ -950,8 +906,7 @@ "Sharded": true }, "FieldQuery": "select col from `user` where 1 != 1", - "Query": "select col from `user` where :__sq_has_values and col in ::__sq1 order by rand()", - "Table": "`user`" + "Query": "select col from `user` where :__sq_has_values and col in ::__sq1 order by rand()" } ] }, @@ -976,7 +931,6 @@ }, "FieldQuery": "select * from `user` where 1 != 1", "Query": "select * from `user` where id = 5 order by col asc", - "Table": "`user`", "Values": [ "5" ], @@ -1003,7 +957,6 @@ }, "FieldQuery": "select `user`.* from `user` where 1 != 1", "Query": "select `user`.* from `user` where id = 5 order by `user`.col asc", - "Table": "`user`", "Values": [ "5" ], @@ -1030,7 +983,6 @@ }, "FieldQuery": "select * from `user` where 1 != 1", "Query": "select * from `user` where id = 5 order by `user`.col asc", - "Table": "`user`", "Values": [ "5" ], @@ -1055,7 +1007,6 @@ "JoinVars": { "u_col": 1 }, - "TableName": "`user`_user_extra", "Inputs": [ { "OperatorType": "Route", @@ -1065,8 +1016,7 @@ "Sharded": true }, "FieldQuery": "select u.id, u.col from `user` as u where 1 != 1", - "Query": "select u.id, u.col from `user` as u where u.col in (select * from `user` where `user`.id = u.id order by col asc)", - "Table": "`user`" + "Query": "select u.id, u.col from `user` as u where u.col in (select * from `user` where `user`.id = u.id order by col asc)" }, { "OperatorType": "Route", @@ -1076,8 +1026,7 @@ "Sharded": true }, "FieldQuery": "select e.id from user_extra as e where 1 != 1", - "Query": "select e.id from user_extra as e where e.col = :u_col /* INT16 */", - "Table": "user_extra" + "Query": "select e.id from user_extra as e where e.col = :u_col /* INT16 */" } ] }, @@ -1102,8 +1051,7 @@ "Sharded": true }, "FieldQuery": "select u.id from `user` as u where 1 != 1", - "Query": "select u.id from `user` as u where u.id in (select col2 from `user` where `user`.id = u.id order by u.col asc)", - "Table": "`user`" + "Query": "select u.id from `user` as u where u.id in (select col2 from `user` where `user`.id = u.id order by u.col asc)" }, "TablesUsed": [ "user.user" @@ -1141,7 +1089,6 @@ }, "FieldQuery": "select * from `user` where 1 != 1", "Query": "select * from `user` where id = 5 order by `user`.col collate utf8_general_ci asc", - "Table": "`user`", "Values": [ "5" ], @@ -1168,7 +1115,6 @@ }, "FieldQuery": "select * from `user` where 1 != 1", "Query": "select * from `user` where id = 5 order by -col1 asc", - "Table": "`user`", "Values": [ "5" ], @@ -1195,7 +1141,6 @@ }, "FieldQuery": "select * from `user` where 1 != 1", "Query": "select * from `user` where id = 5 order by concat(col, col1) collate utf8_general_ci desc", - "Table": "`user`", "Values": [ "5" ], @@ -1222,7 +1167,6 @@ }, "FieldQuery": "select * from `user` where 1 != 1", "Query": "select * from `user` where id = 5 order by id + col collate utf8_general_ci desc", - "Table": "`user`", "Values": [ "5" ], @@ -1249,7 +1193,6 @@ }, "FieldQuery": "select * from (select user_id from user_extra where 1 != 1) as eu, `user` as u where 1 != 1", "Query": "select * from (select user_id from user_extra where user_id = 5) as eu, `user` as u where u.id = 5 and u.id = eu.user_id order by eu.user_id asc", - "Table": "`user`, user_extra", "Values": [ "5" ], @@ -1277,7 +1220,6 @@ }, "FieldQuery": "select col from `user` as route1 where 1 != 1", "Query": "select col from `user` as route1 where id = 1 order by route1.col asc", - "Table": "`user`", "Values": [ "1" ], @@ -1304,7 +1246,6 @@ }, "FieldQuery": "select col1 from `user` where 1 != 1", "Query": "select col1 from `user` where id = 1 limit 1", - "Table": "`user`", "Values": [ "1" ], @@ -1330,7 +1271,6 @@ "OperatorType": "Join", "Variant": "Join", "JoinColumnIndexes": "L:0", - "TableName": "`user`_user_extra", "Inputs": [ { "OperatorType": "Route", @@ -1340,8 +1280,7 @@ "Sharded": true }, "FieldQuery": "select `user`.col from `user` where 1 != 1", - "Query": "select `user`.col from `user`", - "Table": "`user`" + "Query": "select `user`.col from `user`" }, { "OperatorType": "Limit", @@ -1355,8 +1294,7 @@ "Sharded": true }, "FieldQuery": "select 1 from user_extra where 1 != 1", - "Query": "select 1 from user_extra limit 1", - "Table": "user_extra" + "Query": "select 1 from user_extra limit 1" } ] } @@ -1389,8 +1327,7 @@ "Sharded": true }, "FieldQuery": "select col from `user` where 1 != 1", - "Query": "select col from `user` limit 1", - "Table": "`user`" + "Query": "select col from `user` limit 1" } ] }, @@ -1418,8 +1355,7 @@ "Sharded": true }, "FieldQuery": "select col from `user` where 1 != 1", - "Query": "select col from `user` limit :a", - "Table": "`user`" + "Query": "select col from `user` limit :a" } ] }, @@ -1447,8 +1383,7 @@ "Sharded": true }, "FieldQuery": "select * from `user` where 1 != 1", - "Query": "select * from `user` where id1 = 4 and name1 = 'abc' limit 5", - "Table": "`user`" + "Query": "select * from `user` where id1 = 4 and name1 = 'abc' limit 5" } ] }, @@ -1485,8 +1420,7 @@ "Sharded": true }, "FieldQuery": "select col1 from `user` where 1 != 1", - "Query": "select col1 from `user`", - "Table": "`user`" + "Query": "select col1 from `user`" }, { "InputName": "Outer", @@ -1497,8 +1431,7 @@ "Sharded": true }, "FieldQuery": "select col from `user` where 1 != 1", - "Query": "select col from `user` where :__sq_has_values and col in ::__sq1", - "Table": "`user`" + "Query": "select col from `user` where :__sq_has_values and col in ::__sq1" } ] } @@ -1524,8 +1457,7 @@ "Sharded": true }, "FieldQuery": "select col from ref where 1 != 1", - "Query": "select col from ref limit 1", - "Table": "ref" + "Query": "select col from ref limit 1" }, "TablesUsed": [ "user.ref" @@ -1551,8 +1483,7 @@ "Sharded": true }, "FieldQuery": "select id from `user` where 1 != 1", - "Query": "select id from `user` limit 1 + 1", - "Table": "`user`" + "Query": "select id from `user` limit 1 + 1" } ] }, @@ -1578,8 +1509,7 @@ "FieldQuery": "select id as foo, weight_string(id) from music where 1 != 1", "OrderBy": "(0|1) ASC", "Query": "select id as foo, weight_string(id) from music order by music.id asc", - "ResultColumns": 1, - "Table": "music" + "ResultColumns": 1 }, "TablesUsed": [ "user.music" @@ -1603,8 +1533,7 @@ "FieldQuery": "select id as foo, id2 as id, weight_string(id2) from music where 1 != 1", "OrderBy": "(1|2) ASC", "Query": "select id as foo, id2 as id, weight_string(id2) from music order by music.id2 asc", - "ResultColumns": 2, - "Table": "music" + "ResultColumns": 2 }, "TablesUsed": [ "user.music" @@ -1622,7 +1551,6 @@ "OperatorType": "Join", "Variant": "Join", "JoinColumnIndexes": "L:0", - "TableName": "`user`_music", "Inputs": [ { "OperatorType": "Route", @@ -1633,8 +1561,7 @@ }, "FieldQuery": "select `name`, weight_string(`name`) from `user` where 1 != 1", "OrderBy": "(0|1) ASC", - "Query": "select `name`, weight_string(`name`) from `user` order by `user`.`name` asc", - "Table": "`user`" + "Query": "select `name`, weight_string(`name`) from `user` order by `user`.`name` asc" }, { "OperatorType": "Route", @@ -1644,8 +1571,7 @@ "Sharded": true }, "FieldQuery": "select 1 from music where 1 != 1", - "Query": "select 1 from music", - "Table": "music" + "Query": "select 1 from music" } ] }, @@ -1675,8 +1601,7 @@ "Sharded": true }, "FieldQuery": "select count(id), num from `user` where 1 != 1", - "Query": "select count(id), num from `user`", - "Table": "`user`" + "Query": "select count(id), num from `user`" } ] }, @@ -1711,8 +1636,7 @@ "Sharded": true }, "FieldQuery": "select count(id), num, weight_string(num) from `user` where 1 != 1", - "Query": "select count(id), num, weight_string(num) from `user`", - "Table": "`user`" + "Query": "select count(id), num, weight_string(num) from `user`" } ] } @@ -1746,8 +1670,7 @@ }, "FieldQuery": "select count(id), num, weight_string(num) from `user` where 1 != 1 group by num, weight_string(num)", "OrderBy": "(1|2) ASC", - "Query": "select count(id), num, weight_string(num) from `user` group by num, weight_string(num) order by num asc", - "Table": "`user`" + "Query": "select count(id), num, weight_string(num) from `user` group by num, weight_string(num) order by num asc" } ] }, @@ -1784,8 +1707,7 @@ }, "FieldQuery": "select count(id), num, weight_string(num) from `user` where 1 != 1 group by num, weight_string(num)", "OrderBy": "(1|2) ASC", - "Query": "select count(id), num, weight_string(num) from `user` group by num, weight_string(num) order by num asc", - "Table": "`user`" + "Query": "select count(id), num, weight_string(num) from `user` group by num, weight_string(num) order by num asc" } ] } @@ -1807,7 +1729,6 @@ "OperatorType": "Join", "Variant": "Join", "JoinColumnIndexes": "L:0,L:0", - "TableName": "`user`_music", "Inputs": [ { "OperatorType": "Route", @@ -1818,8 +1739,7 @@ }, "FieldQuery": "select `name`, `name`, weight_string(`name`) from `user` where 1 != 1", "OrderBy": "(0|2) ASC", - "Query": "select `name`, `name`, weight_string(`name`) from `user` order by `user`.`name` asc", - "Table": "`user`" + "Query": "select `name`, `name`, weight_string(`name`) from `user` order by `user`.`name` asc" }, { "OperatorType": "Route", @@ -1829,8 +1749,7 @@ "Sharded": true }, "FieldQuery": "select 1 from music where 1 != 1", - "Query": "select 1 from music", - "Table": "music" + "Query": "select 1 from music" } ] }, @@ -1857,8 +1776,7 @@ "FieldQuery": "select id, id, weight_string(id) from `user` where 1 != 1", "OrderBy": "(0|2) ASC", "Query": "select id, id, weight_string(id) from `user` order by `user`.id asc", - "ResultColumns": 2, - "Table": "`user`" + "ResultColumns": 2 }, "TablesUsed": [ "user.user" @@ -1893,8 +1811,7 @@ }, "FieldQuery": "select dt.c0 as col, dt.c1 as `count(*)`, dt.c2 as c1, weight_string(dt.c2) from (select col, count(*), c1 from `user` where 1 != 1 group by col) as dt(c0, c1, c2) where 1 != 1", "OrderBy": "0 ASC", - "Query": "select dt.c0 as col, dt.c1 as `count(*)`, dt.c2 as c1, weight_string(dt.c2) from (select col, count(*), c1 from `user` group by col order by col asc) as dt(c0, c1, c2)", - "Table": "`user`" + "Query": "select dt.c0 as col, dt.c1 as `count(*)`, dt.c2 as c1, weight_string(dt.c2) from (select col, count(*), c1 from `user` group by col order by col asc) as dt(c0, c1, c2)" } ] } @@ -1923,7 +1840,6 @@ "OperatorType": "Join", "Variant": "Join", "JoinColumnIndexes": "L:0,L:1", - "TableName": "`user`_user_extra", "Inputs": [ { "OperatorType": "Route", @@ -1933,8 +1849,7 @@ "Sharded": true }, "FieldQuery": "select `user`.a, weight_string(`user`.a) from `user` where 1 != 1", - "Query": "select distinct `user`.a, weight_string(`user`.a) from `user`", - "Table": "`user`" + "Query": "select distinct `user`.a, weight_string(`user`.a) from `user`" }, { "OperatorType": "Route", @@ -1944,8 +1859,7 @@ "Sharded": true }, "FieldQuery": "select 1 from user_extra where 1 != 1", - "Query": "select distinct 1 from user_extra", - "Table": "user_extra" + "Query": "select distinct 1 from user_extra" } ] } @@ -1980,8 +1894,7 @@ "Sharded": true }, "FieldQuery": "select a as c, a, weight_string(a) from `user` where 1 != 1", - "Query": "select distinct a as c, a, weight_string(a) from `user`", - "Table": "`user`" + "Query": "select distinct a as c, a, weight_string(a) from `user`" } ] }, @@ -2013,8 +1926,7 @@ "Sharded": true }, "FieldQuery": "select a, a, weight_string(a) from `user` where 1 != 1", - "Query": "select distinct a, a, weight_string(a) from `user`", - "Table": "`user`" + "Query": "select distinct a, a, weight_string(a) from `user`" } ] }, @@ -2038,8 +1950,7 @@ "Sharded": false }, "FieldQuery": "select id from unsharded where 1 != 1", - "Query": "select id from unsharded order by (select id from unsharded) asc", - "Table": "unsharded" + "Query": "select id from unsharded order by (select id from unsharded) asc" }, "TablesUsed": [ "main.unsharded" @@ -2070,8 +1981,7 @@ "Sharded": true }, "FieldQuery": "select count(*) as a from `user` where 1 != 1", - "Query": "select count(*) as a from `user`", - "Table": "`user`" + "Query": "select count(*) as a from `user`" } ] } @@ -2099,8 +2009,7 @@ "FieldQuery": "select id, id + 1, weight_string(id + 1) from `user` where 1 != 1", "OrderBy": "(1|2) ASC", "Query": "select id, id + 1, weight_string(id + 1) from `user` order by id + 1 asc", - "ResultColumns": 1, - "Table": "`user`" + "ResultColumns": 1 }, "TablesUsed": [ "user.user" @@ -2124,8 +2033,7 @@ "FieldQuery": "select `user`.col1 as a, `user`.col1 collate utf8_general_ci, weight_string(`user`.col1 collate utf8_general_ci) from `user` where 1 != 1", "OrderBy": "(1|2) ASC", "Query": "select `user`.col1 as a, `user`.col1 collate utf8_general_ci, weight_string(`user`.col1 collate utf8_general_ci) from `user` order by `user`.col1 collate utf8_general_ci asc", - "ResultColumns": 1, - "Table": "`user`" + "ResultColumns": 1 }, "TablesUsed": [ "user.user" @@ -2149,8 +2057,7 @@ "FieldQuery": "select id, id + 1, weight_string(id + 1) from `user` where 1 != 1", "OrderBy": "(1|2) ASC", "Query": "select id, id + 1, weight_string(id + 1) from `user` order by id + 1 asc", - "ResultColumns": 1, - "Table": "`user`" + "ResultColumns": 1 }, "TablesUsed": [ "user.user" @@ -2174,8 +2081,7 @@ "FieldQuery": "select `user`.col1 as a, `user`.col1 collate utf8_general_ci, weight_string(`user`.col1 collate utf8_general_ci) from `user` where 1 != 1", "OrderBy": "(1|2) ASC", "Query": "select `user`.col1 as a, `user`.col1 collate utf8_general_ci, weight_string(`user`.col1 collate utf8_general_ci) from `user` order by `user`.col1 collate utf8_general_ci asc", - "ResultColumns": 1, - "Table": "`user`" + "ResultColumns": 1 }, "TablesUsed": [ "user.user" @@ -2202,7 +2108,6 @@ "JoinVars": { "user_col": 1 }, - "TableName": "`user`_user_extra", "Inputs": [ { "OperatorType": "Route", @@ -2212,8 +2117,7 @@ "Sharded": true }, "FieldQuery": "select id, `user`.col from `user` where 1 != 1", - "Query": "select id, `user`.col from `user`", - "Table": "`user`" + "Query": "select id, `user`.col from `user`" }, { "OperatorType": "Route", @@ -2223,8 +2127,7 @@ "Sharded": true }, "FieldQuery": "select coalesce(:user_col /* INT16 */, user_extra.col) from user_extra where 1 != 1", - "Query": "select coalesce(:user_col /* INT16 */, user_extra.col) from user_extra", - "Table": "user_extra" + "Query": "select coalesce(:user_col /* INT16 */, user_extra.col) from user_extra" } ] } @@ -2261,7 +2164,6 @@ "JoinVars": { "a_tcol1": 1 }, - "TableName": "`user`_music", "Inputs": [ { "OperatorType": "Route", @@ -2272,8 +2174,7 @@ }, "FieldQuery": "select min(a.id), a.tcol1, weight_string(a.tcol1), weight_string(a.id) from `user` as a where 1 != 1 group by a.tcol1, weight_string(a.tcol1), weight_string(a.id)", "OrderBy": "(1|2) ASC", - "Query": "select min(a.id), a.tcol1, weight_string(a.tcol1), weight_string(a.id) from `user` as a group by a.tcol1, weight_string(a.tcol1), weight_string(a.id) order by a.tcol1 asc", - "Table": "`user`" + "Query": "select min(a.id), a.tcol1, weight_string(a.tcol1), weight_string(a.id) from `user` as a group by a.tcol1, weight_string(a.tcol1), weight_string(a.id) order by a.tcol1 asc" }, { "OperatorType": "Route", @@ -2283,8 +2184,7 @@ "Sharded": true }, "FieldQuery": "select 1 from music as b where 1 != 1 group by .0", - "Query": "select 1 from music as b where b.tcol2 = :a_tcol1 group by .0", - "Table": "music" + "Query": "select 1 from music as b where b.tcol2 = :a_tcol1 group by .0" } ] } @@ -2319,8 +2219,7 @@ }, "FieldQuery": "select col from `user` where 1 != 1 group by col", "OrderBy": "0 ASC", - "Query": "select col from `user` where id between :vtg1 and :vtg2 group by col order by `user`.col asc", - "Table": "`user`" + "Query": "select col from `user` where id between :vtg1 and :vtg2 group by col order by `user`.col asc" } ] }, @@ -2351,8 +2250,7 @@ }, "FieldQuery": "select foo, col, weight_string(foo) from `user` where 1 != 1 group by foo, col, weight_string(foo)", "OrderBy": "1 ASC, (0|2) ASC", - "Query": "select foo, col, weight_string(foo) from `user` where id between :vtg1 and :vtg2 group by foo, col, weight_string(foo) order by `user`.col asc, foo asc", - "Table": "`user`" + "Query": "select foo, col, weight_string(foo) from `user` where id between :vtg1 and :vtg2 group by foo, col, weight_string(foo) order by `user`.col asc, foo asc" } ] }, @@ -2389,8 +2287,7 @@ "Sharded": true }, "FieldQuery": "select foo, col, weight_string(foo) from `user` where 1 != 1", - "Query": "select distinct foo, col, weight_string(foo) from `user` where id between :vtg1 and :vtg2", - "Table": "`user`" + "Query": "select distinct foo, col, weight_string(foo) from `user` where id between :vtg1 and :vtg2" } ] } @@ -2423,8 +2320,7 @@ "Sharded": true }, "FieldQuery": "select textcol2, weight_string(textcol2) from `user` where 1 != 1", - "Query": "select distinct textcol2, weight_string(textcol2) from `user`", - "Table": "`user`" + "Query": "select distinct textcol2, weight_string(textcol2) from `user`" } ] }, @@ -2454,8 +2350,7 @@ "Sharded": true }, "FieldQuery": "select textcol1 from `user` where 1 != 1 union select textcol1 from `user` where 1 != 1", - "Query": "select textcol1 from `user` union select textcol1 from `user`", - "Table": "`user`" + "Query": "select textcol1 from `user` union select textcol1 from `user`" } ] }, @@ -2484,7 +2379,6 @@ "OperatorType": "Join", "Variant": "Join", "JoinColumnIndexes": "L:0,R:0,L:1", - "TableName": "`user`_user_extra", "Inputs": [ { "OperatorType": "Route", @@ -2494,8 +2388,7 @@ "Sharded": true }, "FieldQuery": "select a.id, weight_string(a.id) from `user` as a where 1 != 1", - "Query": "select a.id, weight_string(a.id) from `user` as a", - "Table": "`user`" + "Query": "select a.id, weight_string(a.id) from `user` as a" }, { "OperatorType": "Route", @@ -2505,8 +2398,7 @@ "Sharded": true }, "FieldQuery": "select b.id from user_extra as b where 1 != 1", - "Query": "select b.id from user_extra as b", - "Table": "user_extra" + "Query": "select b.id from user_extra as b" } ] }, @@ -2518,8 +2410,7 @@ "Sharded": false }, "FieldQuery": "select dt.c0 as `1`, dt.c1 as `2`, weight_string(dt.c0) from (select 1, 2 from dual where 1 != 1) as dt(c0, c1) where 1 != 1", - "Query": "select dt.c0 as `1`, dt.c1 as `2`, weight_string(dt.c0) from (select 1, 2 from dual) as dt(c0, c1)", - "Table": "dual" + "Query": "select dt.c0 as `1`, dt.c1 as `2`, weight_string(dt.c0) from (select 1, 2 from dual) as dt(c0, c1)" } ] } @@ -2552,7 +2443,6 @@ "OperatorType": "Join", "Variant": "Join", "JoinColumnIndexes": "L:0,R:0,R:1", - "TableName": "`user`_user_extra", "Inputs": [ { "OperatorType": "Route", @@ -2562,8 +2452,7 @@ "Sharded": true }, "FieldQuery": "select a.id from `user` as a where 1 != 1", - "Query": "select a.id from `user` as a", - "Table": "`user`" + "Query": "select a.id from `user` as a" }, { "OperatorType": "Route", @@ -2573,8 +2462,7 @@ "Sharded": true }, "FieldQuery": "select b.id, weight_string(b.id) from user_extra as b where 1 != 1", - "Query": "select b.id, weight_string(b.id) from user_extra as b", - "Table": "user_extra" + "Query": "select b.id, weight_string(b.id) from user_extra as b" } ] }, @@ -2586,8 +2474,7 @@ "Sharded": false }, "FieldQuery": "select dt.c0 as `1`, dt.c1 as `2`, weight_string(dt.c1) from (select 1, 2 from dual where 1 != 1) as dt(c0, c1) where 1 != 1", - "Query": "select dt.c0 as `1`, dt.c1 as `2`, weight_string(dt.c1) from (select 1, 2 from dual) as dt(c0, c1)", - "Table": "dual" + "Query": "select dt.c0 as `1`, dt.c1 as `2`, weight_string(dt.c1) from (select 1, 2 from dual) as dt(c0, c1)" } ] } diff --git a/go/vt/vtgate/planbuilder/testdata/rails_cases.json b/go/vt/vtgate/planbuilder/testdata/rails_cases.json index c3b820e3118..c259feab956 100644 --- a/go/vt/vtgate/planbuilder/testdata/rails_cases.json +++ b/go/vt/vtgate/planbuilder/testdata/rails_cases.json @@ -13,7 +13,6 @@ "JoinVars": { "order2s_id": 0 }, - "TableName": "customer2s, order2s_author5s, book6s_book6s_order2s_supplier5s", "Inputs": [ { "OperatorType": "Route", @@ -23,8 +22,7 @@ "Sharded": true }, "FieldQuery": "select order2s.id from order2s, customer2s where 1 != 1", - "Query": "select order2s.id from order2s, customer2s where customer2s.id = order2s.customer2_id", - "Table": "customer2s, order2s" + "Query": "select order2s.id from order2s, customer2s where customer2s.id = order2s.customer2_id" }, { "OperatorType": "Join", @@ -33,7 +31,6 @@ "JoinVars": { "book6s_supplier5_id": 4 }, - "TableName": "author5s, book6s_book6s_order2s_supplier5s", "Inputs": [ { "OperatorType": "Join", @@ -42,7 +39,6 @@ "JoinVars": { "book6s_id": 5 }, - "TableName": "author5s, book6s_book6s_order2s", "Inputs": [ { "OperatorType": "Route", @@ -52,8 +48,7 @@ "Sharded": true }, "FieldQuery": "select author5s.id, author5s.`name`, author5s.created_at, author5s.updated_at, book6s.supplier5_id, book6s.id from author5s, book6s where 1 != 1", - "Query": "select author5s.id, author5s.`name`, author5s.created_at, author5s.updated_at, book6s.supplier5_id, book6s.id from author5s, book6s where book6s.author5_id = author5s.id", - "Table": "author5s, book6s" + "Query": "select author5s.id, author5s.`name`, author5s.created_at, author5s.updated_at, book6s.supplier5_id, book6s.id from author5s, book6s where book6s.author5_id = author5s.id" }, { "OperatorType": "Route", @@ -64,7 +59,6 @@ }, "FieldQuery": "select 1 from book6s_order2s where 1 != 1", "Query": "select 1 from book6s_order2s where book6s_order2s.order2_id = :order2s_id /* INT64 */ and book6s_order2s.book6_id = :book6s_id /* INT64 */", - "Table": "book6s_order2s", "Values": [ ":book6s_id" ], @@ -81,7 +75,6 @@ }, "FieldQuery": "select 1 from supplier5s where 1 != 1", "Query": "select 1 from supplier5s where supplier5s.id = :book6s_supplier5_id /* INT64 */", - "Table": "supplier5s", "Values": [ ":book6s_supplier5_id" ], diff --git a/go/vt/vtgate/planbuilder/testdata/reference_cases.json b/go/vt/vtgate/planbuilder/testdata/reference_cases.json index 424f80417f9..cb36a8de23c 100644 --- a/go/vt/vtgate/planbuilder/testdata/reference_cases.json +++ b/go/vt/vtgate/planbuilder/testdata/reference_cases.json @@ -14,8 +14,7 @@ "Sharded": false }, "FieldQuery": "select * from ambiguous_ref_with_source where 1 != 1", - "Query": "select * from ambiguous_ref_with_source", - "Table": "ambiguous_ref_with_source" + "Query": "select * from ambiguous_ref_with_source" }, "TablesUsed": [ "main.ambiguous_ref_with_source" @@ -38,8 +37,7 @@ "Sharded": true }, "FieldQuery": "select `user`.col from `user`, ambiguous_ref_with_source where 1 != 1", - "Query": "select `user`.col from `user`, ambiguous_ref_with_source", - "Table": "`user`, ambiguous_ref_with_source" + "Query": "select `user`.col from `user`, ambiguous_ref_with_source" }, "TablesUsed": [ "user.ambiguous_ref_with_source", @@ -63,8 +61,7 @@ "Sharded": false }, "FieldQuery": "select r1.col from ambiguous_ref_with_source as r1 join ambiguous_ref_with_source where 1 != 1", - "Query": "select r1.col from ambiguous_ref_with_source as r1 join ambiguous_ref_with_source", - "Table": "ambiguous_ref_with_source" + "Query": "select r1.col from ambiguous_ref_with_source as r1 join ambiguous_ref_with_source" }, "TablesUsed": [ "main.ambiguous_ref_with_source" @@ -87,8 +84,7 @@ "Sharded": true }, "FieldQuery": "select ambiguous_ref_with_source.col from ambiguous_ref_with_source, `user` where 1 != 1", - "Query": "select ambiguous_ref_with_source.col from ambiguous_ref_with_source, `user`", - "Table": "`user`, ambiguous_ref_with_source" + "Query": "select ambiguous_ref_with_source.col from ambiguous_ref_with_source, `user`" }, "TablesUsed": [ "user.ambiguous_ref_with_source", @@ -113,7 +109,6 @@ }, "FieldQuery": "select ambiguous_ref_with_source.col from (select aa from `user` where 1 != 1) as `user`, ambiguous_ref_with_source where 1 != 1", "Query": "select ambiguous_ref_with_source.col from (select aa from `user` where `user`.id = 1) as `user`, ambiguous_ref_with_source", - "Table": "`user`, ambiguous_ref_with_source", "Values": [ "1" ], @@ -141,8 +136,7 @@ "Sharded": true }, "FieldQuery": "select `user`.col from `user`, ambiguous_ref_with_source where 1 != 1", - "Query": "select `user`.col from `user`, ambiguous_ref_with_source", - "Table": "`user`, ambiguous_ref_with_source" + "Query": "select `user`.col from `user`, ambiguous_ref_with_source" }, "TablesUsed": [ "user.ambiguous_ref_with_source", @@ -165,8 +159,7 @@ "Name": "main", "Sharded": false }, - "Query": "insert into ambiguous_ref_with_source(col) values (1)", - "TableName": "ambiguous_ref_with_source" + "Query": "insert into ambiguous_ref_with_source(col) values (1)" }, "TablesUsed": [ "main.ambiguous_ref_with_source" @@ -189,8 +182,7 @@ "Sharded": true }, "FieldQuery": "select u.id from (select a.id, a.u_id from ref_with_source as a where 1 != 1) as u left join ref_with_source as u0 on u.u_id = u0.u_uid where 1 != 1", - "Query": "select u.id from (select a.id, a.u_id from ref_with_source as a where a.id in (3) order by a.d_at asc limit 1) as u left join ref_with_source as u0 on u.u_id = u0.u_uid order by u.id asc", - "Table": "ref_with_source" + "Query": "select u.id from (select a.id, a.u_id from ref_with_source as a where a.id in (3) order by a.d_at asc limit 1) as u left join ref_with_source as u0 on u.u_id = u0.u_uid order by u.id asc" }, "TablesUsed": [ "user.ref_with_source" @@ -212,8 +204,7 @@ "Name": "main", "Sharded": false }, - "Query": "insert into ambiguous_ref_with_source(col) values (1)", - "TableName": "ambiguous_ref_with_source" + "Query": "insert into ambiguous_ref_with_source(col) values (1)" }, "TablesUsed": [ "main.ambiguous_ref_with_source" @@ -235,8 +226,7 @@ "Name": "main", "Sharded": false }, - "Query": "update ambiguous_ref_with_source set col = 1", - "Table": "ambiguous_ref_with_source" + "Query": "update ambiguous_ref_with_source set col = 1" }, "TablesUsed": [ "main.ambiguous_ref_with_source" @@ -258,8 +248,7 @@ "Name": "main", "Sharded": false }, - "Query": "update ambiguous_ref_with_source set col = 1", - "Table": "ambiguous_ref_with_source" + "Query": "update ambiguous_ref_with_source set col = 1" }, "TablesUsed": [ "main.ambiguous_ref_with_source" @@ -281,8 +270,7 @@ "Name": "main", "Sharded": false }, - "Query": "delete from ambiguous_ref_with_source where col = 1", - "Table": "ambiguous_ref_with_source" + "Query": "delete from ambiguous_ref_with_source where col = 1" }, "TablesUsed": [ "main.ambiguous_ref_with_source" @@ -304,8 +292,7 @@ "Name": "main", "Sharded": false }, - "Query": "delete from ambiguous_ref_with_source where col = 1", - "Table": "ambiguous_ref_with_source" + "Query": "delete from ambiguous_ref_with_source where col = 1" }, "TablesUsed": [ "main.ambiguous_ref_with_source" @@ -328,8 +315,7 @@ "Sharded": true }, "FieldQuery": "select `user`.col from `user`, ref_with_source where 1 != 1", - "Query": "select `user`.col from `user`, ref_with_source", - "Table": "`user`, ref_with_source" + "Query": "select `user`.col from `user`, ref_with_source" }, "TablesUsed": [ "user.ref_with_source", @@ -353,8 +339,7 @@ "Sharded": true }, "FieldQuery": "select `user`.col from `user`, ref_with_source as source_of_ref where 1 != 1", - "Query": "select `user`.col from `user`, ref_with_source as source_of_ref", - "Table": "`user`, ref_with_source" + "Query": "select `user`.col from `user`, ref_with_source as source_of_ref" }, "TablesUsed": [ "user.ref_with_source", @@ -378,8 +363,7 @@ "Sharded": true }, "FieldQuery": "select `user`.col from `user`, ref as rerouted_ref where 1 != 1", - "Query": "select `user`.col from `user`, ref as rerouted_ref", - "Table": "`user`, ref" + "Query": "select `user`.col from `user`, ref as rerouted_ref" }, "TablesUsed": [ "user.ref", @@ -403,8 +387,7 @@ "Sharded": true }, "FieldQuery": "select `user`.col from `user`, global_ref where 1 != 1", - "Query": "select `user`.col from `user`, global_ref", - "Table": "`user`, global_ref" + "Query": "select `user`.col from `user`, global_ref" }, "TablesUsed": [ "user.global_ref", @@ -427,8 +410,7 @@ "Name": "main", "Sharded": false }, - "Query": "insert into global_ref(col) values (1)", - "TableName": "global_ref" + "Query": "insert into global_ref(col) values (1)" }, "TablesUsed": [ "main.global_ref" @@ -450,8 +432,7 @@ "Name": "main", "Sharded": false }, - "Query": "delete from source_of_ref where col = 1", - "Table": "source_of_ref" + "Query": "delete from source_of_ref where col = 1" }, "TablesUsed": [ "main.source_of_ref" @@ -473,8 +454,7 @@ "Name": "main", "Sharded": false }, - "Query": "update source_of_ref set x = 4 where col = 1", - "Table": "source_of_ref" + "Query": "update source_of_ref set x = 4 where col = 1" }, "TablesUsed": [ "main.source_of_ref" @@ -496,8 +476,7 @@ "Name": "main", "Sharded": false }, - "Query": "insert into source_of_ref(x) values (4)", - "TableName": "source_of_ref" + "Query": "insert into source_of_ref(x) values (4)" }, "TablesUsed": [ "main.source_of_ref" @@ -519,8 +498,7 @@ "Name": "main", "Sharded": false }, - "Query": "delete from source_of_ref where col = 1", - "Table": "source_of_ref" + "Query": "delete from source_of_ref where col = 1" }, "TablesUsed": [ "main.source_of_ref" @@ -542,8 +520,7 @@ "Name": "main", "Sharded": false }, - "Query": "update source_of_ref set x = 4 where col = 1", - "Table": "source_of_ref" + "Query": "update source_of_ref set x = 4 where col = 1" }, "TablesUsed": [ "main.source_of_ref" @@ -565,8 +542,7 @@ "Name": "main", "Sharded": false }, - "Query": "insert into source_of_ref(x) values (4)", - "TableName": "source_of_ref" + "Query": "insert into source_of_ref(x) values (4)" }, "TablesUsed": [ "main.source_of_ref" @@ -588,8 +564,7 @@ "Name": "main", "Sharded": false }, - "Query": "delete from source_of_ref where col = 1", - "Table": "source_of_ref" + "Query": "delete from source_of_ref where col = 1" }, "TablesUsed": [ "main.source_of_ref" @@ -611,8 +586,7 @@ "Name": "main", "Sharded": false }, - "Query": "update source_of_ref set x = 4 where col = 1", - "Table": "source_of_ref" + "Query": "update source_of_ref set x = 4 where col = 1" }, "TablesUsed": [ "main.source_of_ref" @@ -634,8 +608,7 @@ "Name": "main", "Sharded": false }, - "Query": "insert into source_of_ref(x) values (4)", - "TableName": "source_of_ref" + "Query": "insert into source_of_ref(x) values (4)" }, "TablesUsed": [ "main.source_of_ref" @@ -657,8 +630,7 @@ "Name": "main", "Sharded": false }, - "Query": "delete from source_of_ref where col = 1", - "Table": "source_of_ref" + "Query": "delete from source_of_ref where col = 1" }, "TablesUsed": [ "main.source_of_ref" @@ -680,8 +652,7 @@ "Name": "main", "Sharded": false }, - "Query": "update source_of_ref set x = 4 where col = 1", - "Table": "source_of_ref" + "Query": "update source_of_ref set x = 4 where col = 1" }, "TablesUsed": [ "main.source_of_ref" @@ -703,8 +674,7 @@ "Name": "main", "Sharded": false }, - "Query": "insert into source_of_ref(x) values (4)", - "TableName": "source_of_ref" + "Query": "insert into source_of_ref(x) values (4)" }, "TablesUsed": [ "main.source_of_ref" @@ -728,7 +698,6 @@ }, "FieldQuery": "select * from ref_with_source as ref, `user` as u where 1 != 1", "Query": "select * from ref_with_source as ref, `user` as u where u.id = 2 and ref.id = u.ref_id", - "Table": "`user`, ref_with_source", "Values": [ "2" ], @@ -757,7 +726,6 @@ }, "FieldQuery": "select * from ref_with_source as ref, `user` as u where 1 != 1", "Query": "select * from ref_with_source as ref, `user` as u where u.id = 2 and ref.id = u.ref_id", - "Table": "`user`, ref_with_source", "Values": [ "2" ], @@ -785,8 +753,7 @@ "Sharded": true }, "FieldQuery": "select 1 from `user` as u, user_extra as ue, ref_with_source as sr, ref as rr where 1 != 1", - "Query": "select 1 from `user` as u, user_extra as ue, ref_with_source as sr, ref as rr where rr.bar = sr.bar and u.id = ue.user_id and sr.foo = ue.foo", - "Table": "`user`, ref, ref_with_source, user_extra" + "Query": "select 1 from `user` as u, user_extra as ue, ref_with_source as sr, ref as rr where rr.bar = sr.bar and u.id = ue.user_id and sr.foo = ue.foo" }, "TablesUsed": [ "user.ref", @@ -817,7 +784,6 @@ "JoinVars": { "m_col": 0 }, - "TableName": "music_rerouted_ref, source_of_ref", "Inputs": [ { "OperatorType": "Route", @@ -828,7 +794,6 @@ }, "FieldQuery": "select m.col from music as m where 1 != 1", "Query": "select m.col from music as m where m.user_id = 1 lock in share mode", - "Table": "music", "Values": [ "1" ], @@ -842,8 +807,7 @@ "Sharded": false }, "FieldQuery": "select sr.id from source_of_ref as sr, rerouted_ref as rr where 1 != 1", - "Query": "select sr.id from source_of_ref as sr, rerouted_ref as rr where sr.col = :m_col and sr.id = rr.id lock in share mode", - "Table": "rerouted_ref, source_of_ref" + "Query": "select sr.id from source_of_ref as sr, rerouted_ref as rr where sr.col = :m_col and sr.id = rr.id lock in share mode" } ] }, @@ -854,8 +818,7 @@ "Name": "main", "Sharded": false }, - "Query": "update source_of_ref as sr set sr.tt = 5 where sr.id in ::dml_vals", - "Table": "source_of_ref" + "Query": "update source_of_ref as sr set sr.tt = 5 where sr.id in ::dml_vals" } ] }, @@ -886,7 +849,6 @@ "JoinVars": { "m_col": 0 }, - "TableName": "music_rerouted_ref, source_of_ref", "Inputs": [ { "OperatorType": "Route", @@ -897,7 +859,6 @@ }, "FieldQuery": "select m.col from music as m where 1 != 1", "Query": "select m.col from music as m where m.user_id = 1", - "Table": "music", "Values": [ "1" ], @@ -911,8 +872,7 @@ "Sharded": false }, "FieldQuery": "select sr.id from source_of_ref as sr, rerouted_ref as rr where 1 != 1", - "Query": "select sr.id from source_of_ref as sr, rerouted_ref as rr where sr.col = :m_col and sr.id = rr.id", - "Table": "rerouted_ref, source_of_ref" + "Query": "select sr.id from source_of_ref as sr, rerouted_ref as rr where sr.col = :m_col and sr.id = rr.id" } ] }, @@ -923,8 +883,7 @@ "Name": "main", "Sharded": false }, - "Query": "delete from source_of_ref as sr where sr.id in ::dml_vals", - "Table": "source_of_ref" + "Query": "delete from source_of_ref as sr where sr.id in ::dml_vals" } ] }, diff --git a/go/vt/vtgate/planbuilder/testdata/select_cases.json b/go/vt/vtgate/planbuilder/testdata/select_cases.json index 38993a78a26..18c9ee63a23 100644 --- a/go/vt/vtgate/planbuilder/testdata/select_cases.json +++ b/go/vt/vtgate/planbuilder/testdata/select_cases.json @@ -14,8 +14,7 @@ "Sharded": true }, "FieldQuery": "select 1 from `user` where 1 != 1", - "Query": "select 1 from `user`", - "Table": "`user`" + "Query": "select 1 from `user`" }, "TablesUsed": [ "user.user" @@ -37,8 +36,7 @@ "Sharded": true }, "FieldQuery": "select `user`.* from `user` where 1 != 1", - "Query": "select `user`.* from `user`", - "Table": "`user`" + "Query": "select `user`.* from `user`" }, "TablesUsed": [ "user.user" @@ -60,8 +58,7 @@ "Sharded": true }, "FieldQuery": "select * from `user` where 1 != 1", - "Query": "select * from `user`", - "Table": "`user`" + "Query": "select * from `user`" }, "TablesUsed": [ "user.user" @@ -87,8 +84,7 @@ "Sharded": true }, "FieldQuery": "select * from `user` as u, user_metadata as um where 1 != 1", - "Query": "select * from `user` as u, user_metadata as um where foo = 41 and u.id = um.user_id limit 20", - "Table": "`user`, user_metadata" + "Query": "select * from `user` as u, user_metadata as um where foo = 41 and u.id = um.user_id limit 20" } ] }, @@ -115,8 +111,7 @@ }, "FieldQuery": "select * from `user` where 1 != 1", "Query": "select /*vt+ QUERY_TIMEOUT_MS=1000 */ * from `user`", - "QueryTimeout": 1000, - "Table": "`user`" + "QueryTimeout": 1000 }, "TablesUsed": [ "user.user" @@ -144,8 +139,7 @@ }, "FieldQuery": "select count(*) from `user` where 1 != 1", "Query": "select /*vt+ QUERY_TIMEOUT_MS=1000 */ count(*) from `user`", - "QueryTimeout": 1000, - "Table": "`user`" + "QueryTimeout": 1000 } ] }, @@ -174,8 +168,7 @@ }, "FieldQuery": "select * from `user` where 1 != 1", "Query": "select /*vt+ QUERY_TIMEOUT_MS=1000 */ * from `user` limit 10", - "QueryTimeout": 1000, - "Table": "`user`" + "QueryTimeout": 1000 } ] }, @@ -200,8 +193,7 @@ }, "FieldQuery": "select * from unsharded where 1 != 1", "Query": "select /*vt+ QUERY_TIMEOUT_MS=1000 */ * from unsharded limit 10", - "QueryTimeout": 1000, - "Table": "unsharded" + "QueryTimeout": 1000 }, "TablesUsed": [ "main.unsharded" @@ -225,8 +217,7 @@ }, "FieldQuery": "select * from `user` where 1 != 1", "Query": "select /*vt+ SCATTER_ERRORS_AS_WARNINGS */ * from `user`", - "ScatterErrorsAsWarnings": true, - "Table": "`user`" + "ScatterErrorsAsWarnings": true }, "TablesUsed": [ "user.user" @@ -254,8 +245,7 @@ }, "FieldQuery": "select count(*) from `user` where 1 != 1", "Query": "select /*vt+ SCATTER_ERRORS_AS_WARNINGS=1 */ count(*) from `user`", - "ScatterErrorsAsWarnings": true, - "Table": "`user`" + "ScatterErrorsAsWarnings": true } ] }, @@ -285,8 +275,7 @@ }, "FieldQuery": "select count(*) from `user` where 1 != 1", "Query": "select /*vt+ SCATTER_ERRORS_AS_WARNINGS=1 */ count(*) from `user`", - "ScatterErrorsAsWarnings": true, - "Table": "`user`" + "ScatterErrorsAsWarnings": true } ] }, @@ -315,8 +304,7 @@ }, "FieldQuery": "select * from `user` where 1 != 1", "Query": "select /*vt+ SCATTER_ERRORS_AS_WARNINGS=1 */ * from `user` limit 10", - "ScatterErrorsAsWarnings": true, - "Table": "`user`" + "ScatterErrorsAsWarnings": true } ] }, @@ -340,8 +328,7 @@ "Sharded": true }, "FieldQuery": "select `user`.* from `user` where 1 != 1", - "Query": "select `user`.* from `user`", - "Table": "`user`" + "Query": "select `user`.* from `user`" }, "TablesUsed": [ "user.user" @@ -363,8 +350,7 @@ "Sharded": true }, "FieldQuery": "select `user`.* from `user` where 1 != 1", - "Query": "select `user`.* from `user`", - "Table": "`user`" + "Query": "select `user`.* from `user`" }, "TablesUsed": [ "user.user" @@ -386,8 +372,7 @@ "Sharded": true }, "FieldQuery": "select user_id, col1, col2 from authoritative where 1 != 1", - "Query": "select user_id, col1, col2 from authoritative", - "Table": "authoritative" + "Query": "select user_id, col1, col2 from authoritative" }, "TablesUsed": [ "user.authoritative" @@ -409,8 +394,7 @@ "Sharded": true }, "FieldQuery": "select a.user_id, a.col1, a.col2, b.user_id, b.col1, b.col2 from authoritative as a, authoritative as b where 1 != 1", - "Query": "select a.user_id, a.col1, a.col2, b.user_id, b.col1, b.col2 from authoritative as a, authoritative as b where a.user_id = b.user_id", - "Table": "authoritative" + "Query": "select a.user_id, a.col1, a.col2, b.user_id, b.col1, b.col2 from authoritative as a, authoritative as b where a.user_id = b.user_id" }, "TablesUsed": [ "user.authoritative" @@ -438,8 +422,7 @@ "Sharded": true }, "FieldQuery": "select user_id, col1, col2 from authoritative as a where 1 != 1", - "Query": "select user_id, col1, col2 from authoritative as a", - "Table": "authoritative" + "Query": "select user_id, col1, col2 from authoritative as a" }, "TablesUsed": [ "user.authoritative" @@ -461,8 +444,7 @@ "Sharded": true }, "FieldQuery": "select * from authoritative, `user` where 1 != 1", - "Query": "select * from authoritative, `user` where authoritative.user_id = `user`.id", - "Table": "`user`, authoritative" + "Query": "select * from authoritative, `user` where authoritative.user_id = `user`.id" }, "TablesUsed": [ "user.authoritative", @@ -485,8 +467,7 @@ "Sharded": true }, "FieldQuery": "select `user`.id, a.user_id, a.col1, a.col2, `user`.col1 from authoritative as a, `user` where 1 != 1", - "Query": "select `user`.id, a.user_id, a.col1, a.col2, `user`.col1 from authoritative as a, `user` where a.user_id = `user`.id", - "Table": "`user`, authoritative" + "Query": "select `user`.id, a.user_id, a.col1, a.col2, `user`.col1 from authoritative as a, `user` where a.user_id = `user`.id" }, "TablesUsed": [ "user.authoritative", @@ -510,8 +491,7 @@ "Sharded": true }, "FieldQuery": "select anon_col from `user`, user_extra where 1 != 1", - "Query": "select anon_col from `user`, user_extra where `user`.id = user_extra.user_id", - "Table": "`user`, user_extra" + "Query": "select anon_col from `user`, user_extra where `user`.id = user_extra.user_id" }, "TablesUsed": [ "user.user", @@ -536,7 +516,6 @@ }, "FieldQuery": "select count(1) from `user` where 1 != 1 group by n_id", "Query": "select count(1) from `user` where id = 'abc' group by n_id having json_arrayagg(a_id) = '[]'", - "Table": "`user`", "Values": [ "'abc'" ], @@ -564,7 +543,6 @@ }, "FieldQuery": "select count(1) from `user` where 1 != 1 group by n_id", "Query": "select count(1) from `user` where id = 'abc' group by n_id having json_objectagg(a_id, b_id) = '[]'", - "Table": "`user`", "Values": [ "'abc'" ], @@ -599,7 +577,6 @@ "OperatorType": "Join", "Variant": "Join", "JoinColumnIndexes": "L:0,R:0", - "TableName": "`user`_user_extra", "Inputs": [ { "OperatorType": "Route", @@ -609,8 +586,7 @@ "Sharded": true }, "FieldQuery": "select id from `user` where 1 != 1", - "Query": "select id from `user`", - "Table": "`user`" + "Query": "select id from `user`" }, { "OperatorType": "Route", @@ -620,8 +596,7 @@ "Sharded": true }, "FieldQuery": "select user_id from user_extra where 1 != 1", - "Query": "select user_id from user_extra", - "Table": "user_extra" + "Query": "select user_id from user_extra" } ] }, @@ -671,8 +646,7 @@ "Sharded": false }, "FieldQuery": "select :__lastInsertId as x from unsharded where 1 != 1", - "Query": "select :__lastInsertId as x from unsharded", - "Table": "unsharded" + "Query": "select :__lastInsertId as x from unsharded" }, "TablesUsed": [ "main.unsharded" @@ -695,8 +669,7 @@ "Sharded": false }, "FieldQuery": "select @@auto_increment_increment from dual where 1 != 1", - "Query": "select @@auto_increment_increment from dual", - "Table": "dual" + "Query": "select @@auto_increment_increment from dual" }, "TablesUsed": [ "main.dual" @@ -719,7 +692,6 @@ }, "FieldQuery": "select * from pin_test where 1 != 1", "Query": "select * from pin_test", - "Table": "pin_test", "Values": [ "'\ufffd'" ], @@ -747,7 +719,6 @@ "OperatorType": "Join", "Variant": "Join", "JoinColumnIndexes": "R:0", - "TableName": "`user`_user_extra", "Inputs": [ { "OperatorType": "Route", @@ -757,8 +728,7 @@ "Sharded": true }, "FieldQuery": "select 1 from `user` where 1 != 1", - "Query": "select 1 from `user`", - "Table": "`user`" + "Query": "select 1 from `user`" }, { "OperatorType": "Route", @@ -768,8 +738,7 @@ "Sharded": true }, "FieldQuery": "select user_extra.id from user_extra where 1 != 1", - "Query": "select user_extra.id from user_extra", - "Table": "user_extra" + "Query": "select user_extra.id from user_extra" } ] }, @@ -791,7 +760,6 @@ "OperatorType": "Join", "Variant": "Join", "JoinColumnIndexes": "L:0,R:0", - "TableName": "`user`_user_extra", "Inputs": [ { "OperatorType": "Route", @@ -801,8 +769,7 @@ "Sharded": true }, "FieldQuery": "select `user`.col from `user` where 1 != 1", - "Query": "select `user`.col from `user`", - "Table": "`user`" + "Query": "select `user`.col from `user`" }, { "OperatorType": "Route", @@ -812,8 +779,7 @@ "Sharded": true }, "FieldQuery": "select user_extra.id from user_extra where 1 != 1", - "Query": "select user_extra.id from user_extra", - "Table": "user_extra" + "Query": "select user_extra.id from user_extra" } ] }, @@ -835,7 +801,6 @@ "OperatorType": "Join", "Variant": "Join", "JoinColumnIndexes": "L:0,R:0", - "TableName": "`user`_user_extra", "Inputs": [ { "OperatorType": "Route", @@ -845,8 +810,7 @@ "Sharded": true }, "FieldQuery": "select `user`.col from `user` where 1 != 1", - "Query": "select `user`.col from `user`", - "Table": "`user`" + "Query": "select `user`.col from `user`" }, { "OperatorType": "Route", @@ -856,8 +820,7 @@ "Sharded": true }, "FieldQuery": "select user_extra.id + user_extra.col from user_extra where 1 != 1", - "Query": "select user_extra.id + user_extra.col from user_extra", - "Table": "user_extra" + "Query": "select user_extra.id + user_extra.col from user_extra" } ] }, @@ -884,7 +847,6 @@ }, "FieldQuery": "select col, trim((select user_name from `user` where 1 != 1)) as val from user_extra where 1 != 1 group by col", "Query": "select col, trim((select user_name from `user` where id = 3)) as val from user_extra where user_id = 3 group by col order by trim((select `user`.user_name from `user` where `user`.id = 3)) asc", - "Table": "user_extra", "Values": [ "3" ], @@ -908,7 +870,6 @@ "OperatorType": "Join", "Variant": "Join", "JoinColumnIndexes": "L:0,R:0,L:1", - "TableName": "`user`_user_extra", "Inputs": [ { "OperatorType": "Route", @@ -918,8 +879,7 @@ "Sharded": true }, "FieldQuery": "select `user`.col, `user`.col2 from `user` where 1 != 1", - "Query": "select `user`.col, `user`.col2 from `user`", - "Table": "`user`" + "Query": "select `user`.col, `user`.col2 from `user`" }, { "OperatorType": "Route", @@ -929,8 +889,7 @@ "Sharded": true }, "FieldQuery": "select user_extra.id from user_extra where 1 != 1", - "Query": "select user_extra.id from user_extra", - "Table": "user_extra" + "Query": "select user_extra.id from user_extra" } ] }, @@ -952,7 +911,6 @@ "OperatorType": "Join", "Variant": "Join", "JoinColumnIndexes": "L:0", - "TableName": "`user`_user_extra", "Inputs": [ { "OperatorType": "Route", @@ -962,8 +920,7 @@ "Sharded": true }, "FieldQuery": "select `user`.col from `user` where 1 != 1", - "Query": "select /* comment */ `user`.col from `user`", - "Table": "`user`" + "Query": "select /* comment */ `user`.col from `user`" }, { "OperatorType": "Route", @@ -973,8 +930,7 @@ "Sharded": true }, "FieldQuery": "select 1 from user_extra where 1 != 1", - "Query": "select /* comment */ 1 from user_extra", - "Table": "user_extra" + "Query": "select /* comment */ 1 from user_extra" } ] }, @@ -996,7 +952,6 @@ "OperatorType": "Join", "Variant": "Join", "JoinColumnIndexes": "L:0", - "TableName": "`user`_user_extra", "Inputs": [ { "OperatorType": "Route", @@ -1006,8 +961,7 @@ "Sharded": true }, "FieldQuery": "select `user`.col from `user` where 1 != 1", - "Query": "select `user`.col from `user` for update", - "Table": "`user`" + "Query": "select `user`.col from `user` for update" }, { "OperatorType": "Route", @@ -1017,8 +971,7 @@ "Sharded": true }, "FieldQuery": "select 1 from user_extra where 1 != 1", - "Query": "select 1 from user_extra for update", - "Table": "user_extra" + "Query": "select 1 from user_extra for update" } ] }, @@ -1043,7 +996,6 @@ "JoinVars": { "user_id": 0 }, - "TableName": "`user`_unsharded", "Inputs": [ { "OperatorType": "Route", @@ -1053,8 +1005,7 @@ "Sharded": true }, "FieldQuery": "select `user`.id, `user`.id from `user` where 1 != 1", - "Query": "select `user`.id, `user`.id from `user`", - "Table": "`user`" + "Query": "select `user`.id, `user`.id from `user`" }, { "OperatorType": "Route", @@ -1064,8 +1015,7 @@ "Sharded": false }, "FieldQuery": "select (select :user_id + outm.m + unsharded.m from unsharded where 1 != 1) as `(select ``user``.id + outm.m + unsharded.m from unsharded)` from unsharded as outm where 1 != 1", - "Query": "select (select :user_id + outm.m + unsharded.m from unsharded) as `(select ``user``.id + outm.m + unsharded.m from unsharded)` from unsharded as outm", - "Table": "unsharded" + "Query": "select (select :user_id + outm.m + unsharded.m from unsharded) as `(select ``user``.id + outm.m + unsharded.m from unsharded)` from unsharded as outm" } ] }, @@ -1087,7 +1037,6 @@ "OperatorType": "Join", "Variant": "Join", "JoinColumnIndexes": "L:0,R:0", - "TableName": "`user`_user_extra", "Inputs": [ { "OperatorType": "Route", @@ -1097,8 +1046,7 @@ "Sharded": true }, "FieldQuery": "select `user`.Col from `user` where 1 != 1", - "Query": "select `user`.Col from `user`", - "Table": "`user`" + "Query": "select `user`.Col from `user`" }, { "OperatorType": "Route", @@ -1108,8 +1056,7 @@ "Sharded": true }, "FieldQuery": "select user_extra.Id from user_extra where 1 != 1", - "Query": "select user_extra.Id from user_extra", - "Table": "user_extra" + "Query": "select user_extra.Id from user_extra" } ] }, @@ -1142,7 +1089,6 @@ }, "FieldQuery": "select * from `user` where 1 != 1", "Query": "select * from `user` where id = 0x04", - "Table": "`user`", "Values": [ "_binary'\u0004'" ], @@ -1168,8 +1114,7 @@ "Sharded": true }, "FieldQuery": "select * from `user` where 1 != 1", - "Query": "select * from `user` where id = 1", - "Table": "`user`" + "Query": "select * from `user` where id = 1" }, "TablesUsed": [ "user.user" @@ -1205,7 +1150,6 @@ }, "FieldQuery": "select `name`, keyspace_id from name_user_vdx where 1 != 1", "Query": "select `name`, keyspace_id from name_user_vdx where `name` in ::__vals", - "Table": "name_user_vdx", "Values": [ "::name" ], @@ -1219,8 +1163,7 @@ "Sharded": true }, "FieldQuery": "select intcol, id from `user` where 1 != 1", - "Query": "select intcol, id from `user` where costly = 'aa' and `name` = 'bb' and id = 3", - "Table": "`user`" + "Query": "select intcol, id from `user` where costly = 'aa' and `name` = 'bb' and id = 3" } ] }, @@ -1258,8 +1201,7 @@ "FieldQuery": "select user_id, weight_string(user_id) from music where 1 != 1", "OrderBy": "(0|1) ASC", "Query": "select user_id, weight_string(user_id) from music order by music.user_id asc limit 30", - "ResultColumns": 1, - "Table": "music" + "ResultColumns": 1 } ] }, @@ -1290,8 +1232,7 @@ "FieldQuery": "select user_id, weight_string(user_id) from music where 1 != 1", "OrderBy": "(0|1) ASC", "Query": "select user_id, weight_string(user_id) from music order by music.user_id asc limit :__upper_limit", - "ResultColumns": 1, - "Table": "music" + "ResultColumns": 1 } ] }, @@ -1317,7 +1258,6 @@ }, "FieldQuery": "select * from `user` where 1 != 1", "Query": "select * from `user` where `name` = 'abc' and id = 4 limit 5", - "Table": "`user`", "Values": [ "4" ], @@ -1345,7 +1285,6 @@ }, "FieldQuery": "select * from `user` where 1 != 1", "Query": "select * from `user` where id = 4 and `name` = 'abc' limit 5", - "Table": "`user`", "Values": [ "4" ], @@ -1373,7 +1312,6 @@ }, "FieldQuery": "select (select (select col from `user` where 1 != 1) from `user` where 1 != 1) from `user` where 1 != 1", "Query": "select (select (select col from `user` where id = 1) from `user` where id = 1) from `user` where id = 1", - "Table": "`user`", "Values": [ "1" ], @@ -1400,7 +1338,6 @@ }, "FieldQuery": "select 1 from `user` where 1 != 1", "Query": "select 1 from `user` where id = 1 and 1 = (select (select intcol from `user` where id = 1) from `user` where id = 1)", - "Table": "`user`", "Values": [ "1" ], @@ -1427,7 +1364,6 @@ }, "FieldQuery": "select * from `user` where 1 != 1", "Query": "select * from `user` where id = 4 and `name` = 'abc' limit 5", - "Table": "`user`", "Values": [ "4" ], @@ -1455,7 +1391,6 @@ }, "FieldQuery": "select user0_.col as col0_ from `user` as user0_ where 1 != 1", "Query": "select user0_.col as col0_ from `user` as user0_ where id = 1 order by user0_.col desc limit 2", - "Table": "`user`", "Values": [ "1" ], @@ -1482,7 +1417,6 @@ }, "FieldQuery": "select user0_.col as col0_ from `user` as user0_ where 1 != 1", "Query": "select user0_.col as col0_ from `user` as user0_ where id = 1 order by user0_.col desc limit 3", - "Table": "`user`", "Values": [ "1" ], @@ -1509,7 +1443,6 @@ }, "FieldQuery": "select * from `user` where 1 != 1", "Query": "select * from `user` where id = 1 and `name` = true limit 5", - "Table": "`user`", "Values": [ "1" ], @@ -1537,7 +1470,6 @@ }, "FieldQuery": "select * from `user` where 1 != 1", "Query": "select * from `user` where id = 1 and `name` limit 5", - "Table": "`user`", "Values": [ "1" ], @@ -1565,7 +1497,6 @@ }, "FieldQuery": "select * from `user` where 1 != 1", "Query": "select * from `user` where id = 5 and `name` = true limit 5", - "Table": "`user`", "Values": [ "5" ], @@ -1600,8 +1531,7 @@ "Sharded": true }, "FieldQuery": "select col from `user` where 1 != 1", - "Query": "select col from `user`", - "Table": "`user`" + "Query": "select col from `user`" }, { "InputName": "Outer", @@ -1612,8 +1542,7 @@ "Sharded": false }, "FieldQuery": "select a, :__sq1 /* INT16 */ as `(select col from ``user``)` from unsharded where 1 != 1", - "Query": "select a, :__sq1 /* INT16 */ as `(select col from ``user``)` from unsharded", - "Table": "unsharded" + "Query": "select a, :__sq1 /* INT16 */ as `(select col from ``user``)` from unsharded" } ] }, @@ -1647,8 +1576,7 @@ "Sharded": true }, "FieldQuery": "select col from `user` where 1 != 1", - "Query": "select col from `user`", - "Table": "`user`" + "Query": "select col from `user`" }, { "InputName": "Outer", @@ -1659,8 +1587,7 @@ "Sharded": false }, "FieldQuery": "select a, 1 + :__sq1 /* INT16 */ as `1 + (select col from ``user``)` from unsharded where 1 != 1", - "Query": "select a, 1 + :__sq1 /* INT16 */ as `1 + (select col from ``user``)` from unsharded", - "Table": "unsharded" + "Query": "select a, 1 + :__sq1 /* INT16 */ as `1 + (select col from ``user``)` from unsharded" } ] }, @@ -1682,7 +1609,6 @@ "OperatorType": "Join", "Variant": "Join", "JoinColumnIndexes": "L:0,R:0", - "TableName": "`user`_user_extra", "Inputs": [ { "OperatorType": "Route", @@ -1692,8 +1618,7 @@ "Sharded": true }, "FieldQuery": "select t.id1 from (select `user`.id as id1 from `user` where 1 != 1) as t where 1 != 1", - "Query": "select t.id1 from (select `user`.id as id1 from `user`) as t", - "Table": "`user`" + "Query": "select t.id1 from (select `user`.id as id1 from `user`) as t" }, { "OperatorType": "Route", @@ -1703,8 +1628,7 @@ "Sharded": true }, "FieldQuery": "select t.id2 from (select user_extra.id as id2 from user_extra where 1 != 1) as t where 1 != 1", - "Query": "select t.id2 from (select user_extra.id as id2 from user_extra) as t", - "Table": "user_extra" + "Query": "select t.id2 from (select user_extra.id as id2 from user_extra) as t" } ] }, @@ -1743,7 +1667,6 @@ }, "FieldQuery": "select * from music where 1 != 1 union select * from `user` where 1 != 1", "Query": "select * from music where user_id = 1 union select * from `user` where id = 1", - "Table": "`user`, music", "Values": [ "1" ], @@ -1772,7 +1695,6 @@ }, "FieldQuery": "select *, :__lastInsertId as `last_insert_id()` from music where 1 != 1 union select * from `user` where 1 != 1", "Query": "select *, :__lastInsertId as `last_insert_id()` from music where user_id = 1 union select * from `user` where id = 1", - "Table": "`user`, music", "Values": [ "1" ], @@ -1800,8 +1722,7 @@ "Sharded": false }, "FieldQuery": "select * from (select col1, col2 from unsharded where 1 != 1 union select col1, col2 from unsharded where 1 != 1) as a where 1 != 1", - "Query": "select * from (select col1, col2 from unsharded where id = 1 union select col1, col2 from unsharded where id = 3) as a", - "Table": "unsharded" + "Query": "select * from (select col1, col2 from unsharded where id = 1 union select col1, col2 from unsharded where id = 3) as a" }, "TablesUsed": [ "main.unsharded" @@ -1823,8 +1744,7 @@ "Sharded": false }, "FieldQuery": "select id, `name` from unsharded where 1 != 1", - "Query": "select id, `name` from unsharded where id in (select id from unsharded where id = 1 union select id from unsharded where id = 3)", - "Table": "unsharded" + "Query": "select id, `name` from unsharded where id in (select id from unsharded where id = 1 union select id from unsharded where id = 3)" }, "TablesUsed": [ "main.unsharded" @@ -1846,8 +1766,7 @@ "Sharded": false }, "FieldQuery": "select id from unsharded where 1 != 1 union select id from unsharded_auto where 1 != 1", - "Query": "select id from unsharded union select id from unsharded_auto order by id asc limit 5", - "Table": "unsharded, unsharded_auto" + "Query": "select id from unsharded union select id from unsharded_auto order by id asc limit 5" }, "TablesUsed": [ "main.unsharded", @@ -1870,8 +1789,7 @@ "Sharded": false }, "FieldQuery": "select id from unsharded where 1 != 1 union select id from unsharded_auto where 1 != 1 union select id from unsharded_auto where 1 != 1", - "Query": "select id from unsharded union select id from unsharded_auto union select id from unsharded_auto where id in (132)", - "Table": "unsharded, unsharded_auto" + "Query": "select id from unsharded union select id from unsharded_auto union select id from unsharded_auto where id in (132)" }, "TablesUsed": [ "main.unsharded", @@ -1894,8 +1812,7 @@ "Sharded": false }, "FieldQuery": "select id from unsharded where 1 != 1 union select id from unsharded_auto where 1 != 1 union select id from unsharded_auto where 1 != 1 union select `name` from unsharded where 1 != 1", - "Query": "select id from unsharded union select id from unsharded_auto union select id from unsharded_auto union select `name` from unsharded", - "Table": "unsharded, unsharded_auto" + "Query": "select id from unsharded union select id from unsharded_auto union select id from unsharded_auto union select `name` from unsharded" }, "TablesUsed": [ "main.unsharded", @@ -1918,8 +1835,7 @@ "Sharded": false }, "FieldQuery": "(select id from unsharded where 1 != 1) union (select id from unsharded where 1 != 1)", - "Query": "(select id from unsharded order by id asc limit 1) union (select id from unsharded order by id desc limit 1) order by id asc limit 1", - "Table": "unsharded" + "Query": "(select id from unsharded order by id asc limit 1) union (select id from unsharded order by id desc limit 1) order by id asc limit 1" }, "TablesUsed": [ "main.unsharded" @@ -1942,8 +1858,7 @@ }, "FieldQuery": "select * from unsharded as route2 where 1 != 1", "Query": "select /*vt+ QUERY_TIMEOUT_MS=1000 */ * from unsharded as route2", - "QueryTimeout": 1000, - "Table": "unsharded" + "QueryTimeout": 1000 }, "TablesUsed": [ "main.unsharded" @@ -1966,8 +1881,7 @@ "Sharded": true }, "FieldQuery": "select * from music as bar where 1 != 1", - "Query": "select * from music as bar where id > 2", - "Table": "music" + "Query": "select * from music as bar where id > 2" }, "TablesUsed": [ "user.music" @@ -2035,8 +1949,7 @@ }, "FieldQuery": "select sum(intcol) as avg_col, textcol1, textcol2, count(intcol), weight_string(textcol2) from `user` where 1 != 1 group by textcol1, textcol2, weight_string(textcol2)", "OrderBy": "1 ASC COLLATE latin1_swedish_ci, (2|4) ASC COLLATE ", - "Query": "select sum(intcol) as avg_col, textcol1, textcol2, count(intcol), weight_string(textcol2) from `user` group by textcol1, textcol2, weight_string(textcol2) order by textcol1 asc, textcol2 asc", - "Table": "`user`" + "Query": "select sum(intcol) as avg_col, textcol1, textcol2, count(intcol), weight_string(textcol2) from `user` group by textcol1, textcol2, weight_string(textcol2) order by textcol1 asc, textcol2 asc" } ] } @@ -2064,8 +1977,7 @@ "Sharded": false }, "FieldQuery": "select 42 from dual where 1 != 1", - "Query": "select 42 from dual where 0", - "Table": "dual" + "Query": "select 42 from dual where 0" }, "TablesUsed": [ "main.dual" @@ -2101,8 +2013,7 @@ "Sharded": false }, "FieldQuery": "select id from unsharded_a where 1 != 1", - "Query": "select id from unsharded_a where colb = 2", - "Table": "unsharded_a" + "Query": "select id from unsharded_a where colb = 2" }, { "InputName": "Outer", @@ -2113,8 +2024,7 @@ "Sharded": true }, "FieldQuery": "select count(*) from `user` where 1 != 1", - "Query": "select count(*) from `user` where `user`.id = 2 or :__sq_has_values and `user`.id in ::__sq1", - "Table": "`user`" + "Query": "select count(*) from `user` where `user`.id = 2 or :__sq_has_values and `user`.id in ::__sq1" } ] } @@ -2156,8 +2066,7 @@ "Sharded": false }, "FieldQuery": "select id from unsharded_a where 1 != 1", - "Query": "select id from unsharded_a where colb = 2", - "Table": "unsharded_a" + "Query": "select id from unsharded_a where colb = 2" }, { "InputName": "Outer", @@ -2168,8 +2077,7 @@ "Sharded": true }, "FieldQuery": "select count(*) from `user` where 1 != 1", - "Query": "select count(*) from `user` where `user`.id = 2 or (not :__sq_has_values or `user`.id not in ::__sq1)", - "Table": "`user`" + "Query": "select count(*) from `user` where `user`.id = 2 or (not :__sq_has_values or `user`.id not in ::__sq1)" } ] } @@ -2221,7 +2129,6 @@ }, "FieldQuery": "select * from music where 1 != 1", "Query": "select * from music where user_id = 1", - "Table": "music", "Values": [ "1" ], @@ -2254,8 +2161,7 @@ "Sharded": true }, "FieldQuery": "select * from music where 1 != 1", - "Query": "select * from music limit 100", - "Table": "music" + "Query": "select * from music limit 100" } ] }, @@ -2272,8 +2178,7 @@ "Sharded": true }, "FieldQuery": "select count(*) from music where 1 != 1", - "Query": "select count(*) from music", - "Table": "music" + "Query": "select count(*) from music" } ] } @@ -2303,7 +2208,6 @@ }, "FieldQuery": "select * from music where 1 != 1", "Query": "select * from music where user_id = 1 limit 2", - "Table": "music", "Values": [ "1" ], @@ -2318,7 +2222,6 @@ }, "FieldQuery": "select count(*) from music where 1 != 1", "Query": "select count(*) from music where user_id = 1", - "Table": "music", "Values": [ "1" ], @@ -2355,8 +2258,7 @@ "FieldQuery": "select user_id, count(id), weight_string(user_id) from music where 1 != 1 group by user_id", "OrderBy": "(0|2) ASC", "Query": "select user_id, count(id), weight_string(user_id) from music group by user_id having count(user_id) = 1 order by music.user_id asc limit 2", - "ResultColumns": 2, - "Table": "music" + "ResultColumns": 2 } ] }, @@ -2373,8 +2275,7 @@ "Sharded": true }, "FieldQuery": "select count(*) from (select user_id, count(id) from music where 1 != 1 group by user_id) as t where 1 != 1", - "Query": "select count(*) from (select user_id, count(id) from music group by user_id having count(user_id) = 1) as t", - "Table": "music" + "Query": "select count(*) from (select user_id, count(id) from music group by user_id having count(user_id) = 1) as t" } ] } @@ -2412,8 +2313,7 @@ "Sharded": false }, "FieldQuery": "select * from unsharded where 1 != 1", - "Query": "select * from unsharded into dumpfile 'x.txt'", - "Table": "unsharded" + "Query": "select * from unsharded into dumpfile 'x.txt'" }, "TablesUsed": [ "main.unsharded" @@ -2436,8 +2336,7 @@ "Sharded": false }, "FieldQuery": "select * from unsharded where 1 != 1", - "Query": "select * from unsharded into outfile 'x.txt' character set binary fields terminated by 'term' optionally enclosed by 'c' escaped by 'e' lines starting by 'a' terminated by '\\n'", - "Table": "unsharded" + "Query": "select * from unsharded into outfile 'x.txt' character set binary fields terminated by 'term' optionally enclosed by 'c' escaped by 'e' lines starting by 'a' terminated by '\\n'" }, "TablesUsed": [ "main.unsharded" @@ -2460,8 +2359,7 @@ "Sharded": false }, "FieldQuery": "select * from unsharded where 1 != 1", - "Query": "select * from unsharded into outfile s3 'out_file_name' character set binary format csv header fields terminated by 'term' optionally enclosed by 'c' escaped by 'e' lines starting by 'a' terminated by '\\n' manifest on overwrite off", - "Table": "unsharded" + "Query": "select * from unsharded into outfile s3 'out_file_name' character set binary format csv header fields terminated by 'term' optionally enclosed by 'c' escaped by 'e' lines starting by 'a' terminated by '\\n' manifest on overwrite off" }, "TablesUsed": [ "main.unsharded" @@ -2485,7 +2383,6 @@ }, "FieldQuery": "select t.title, `user`.col from (select 'hello' as title from dual where 1 != 1) as t left join `user` on `user`.id = 1 where 1 != 1", "Query": "select t.title, `user`.col from (select 'hello' as title from dual) as t left join `user` on `user`.id = 1", - "Table": "`user`, dual", "Values": [ "1" ], @@ -2508,7 +2405,6 @@ "OperatorType": "Join", "Variant": "LeftJoin", "JoinColumnIndexes": "L:0,R:0", - "TableName": "dual_`user`", "Inputs": [ { "OperatorType": "Route", @@ -2518,8 +2414,7 @@ "Sharded": false }, "FieldQuery": "select t.title from (select 'hello' as title from dual where 1 != 1) as t where 1 != 1", - "Query": "select t.title from (select 'hello' as title from dual) as t", - "Table": "dual" + "Query": "select t.title from (select 'hello' as title from dual) as t" }, { "OperatorType": "Route", @@ -2529,8 +2424,7 @@ "Sharded": true }, "FieldQuery": "select `user`.col from `user` where 1 != 1", - "Query": "select `user`.col from `user` where `user`.id <= 4", - "Table": "`user`" + "Query": "select `user`.col from `user` where `user`.id <= 4" } ] }, @@ -2554,7 +2448,6 @@ "JoinVars": { "t_title": 0 }, - "TableName": "dual_`user`", "Inputs": [ { "OperatorType": "Route", @@ -2564,8 +2457,7 @@ "Sharded": false }, "FieldQuery": "select t.title from (select 'hello' as title from dual where 1 != 1) as t where 1 != 1", - "Query": "select t.title from (select 'hello' as title from dual) as t", - "Table": "dual" + "Query": "select t.title from (select 'hello' as title from dual) as t" }, { "OperatorType": "Route", @@ -2575,8 +2467,7 @@ "Sharded": true }, "FieldQuery": "select `user`.col from `user` where 1 != 1", - "Query": "select `user`.col from `user` where `user`.col = :t_title /* VARCHAR */ and `user`.id <= 4", - "Table": "`user`" + "Query": "select `user`.col from `user` where `user`.col = :t_title /* VARCHAR */ and `user`.id <= 4" } ] }, @@ -2601,8 +2492,7 @@ "Sharded": true }, "FieldQuery": "select t.title, `user`.col from `user` left join (select 'hello' as title from dual where 1 != 1) as t on `user`.id <= 4 where 1 != 1", - "Query": "select t.title, `user`.col from `user` left join (select 'hello' as title from dual) as t on `user`.id <= 4", - "Table": "`user`, dual" + "Query": "select t.title, `user`.col from `user` left join (select 'hello' as title from dual) as t on `user`.id <= 4" }, "TablesUsed": [ "main.dual", @@ -2626,7 +2516,6 @@ }, "FieldQuery": "select t.title, `user`.col from (select 'hello' as title from dual where 1 != 1) as t left join `user` on `user`.id = 1 where 1 != 1", "Query": "select t.title, `user`.col from (select 'hello' as title from dual) as t left join `user` on `user`.id = 1", - "Table": "`user`, dual", "Values": [ "1" ], @@ -2649,7 +2538,6 @@ "OperatorType": "Join", "Variant": "LeftJoin", "JoinColumnIndexes": "L:0,R:0", - "TableName": "dual_`user`", "Inputs": [ { "OperatorType": "Route", @@ -2659,8 +2547,7 @@ "Sharded": false }, "FieldQuery": "select t.title from (select 'hello' as title from dual where 1 != 1) as t where 1 != 1", - "Query": "select t.title from (select 'hello' as title from dual) as t", - "Table": "dual" + "Query": "select t.title from (select 'hello' as title from dual) as t" }, { "OperatorType": "Route", @@ -2670,8 +2557,7 @@ "Sharded": true }, "FieldQuery": "select `user`.col from `user` where 1 != 1", - "Query": "select `user`.col from `user` where `user`.id >= 4", - "Table": "`user`" + "Query": "select `user`.col from `user` where `user`.id >= 4" } ] }, @@ -2715,7 +2601,6 @@ }, "FieldQuery": "select (select u.id from `user` as u where 1 != 1), a.id from `user` as a where 1 != 1", "Query": "select (select u.id from `user` as u where u.id = 1), a.id from `user` as a where a.id = 1", - "Table": "`user`", "Values": [ "1" ], @@ -2737,7 +2622,6 @@ "OperatorType": "Join", "Variant": "Join", "JoinColumnIndexes": "R:0,R:1", - "TableName": "unsharded_`user`, user_extra", "Inputs": [ { "OperatorType": "Route", @@ -2747,8 +2631,7 @@ "Sharded": false }, "FieldQuery": "select 1 from unsharded where 1 != 1", - "Query": "select 1 from unsharded", - "Table": "unsharded" + "Query": "select 1 from unsharded" }, { "OperatorType": "Route", @@ -2758,8 +2641,7 @@ "Sharded": true }, "FieldQuery": "select t.id, s.id from `user` as t, user_extra as s where 1 != 1", - "Query": "select t.id, s.id from `user` as t, user_extra as s where t.id = s.user_id", - "Table": "`user`, user_extra" + "Query": "select t.id, s.id from `user` as t, user_extra as s where t.id = s.user_id" } ] }, @@ -2809,8 +2691,7 @@ "Sharded": true }, "FieldQuery": "select 42, id from dual, `user` where 1 != 1", - "Query": "select 42, id from dual, `user`", - "Table": "`user`, dual" + "Query": "select 42, id from dual, `user`" }, "TablesUsed": [ "main.dual", @@ -2830,7 +2711,6 @@ "OperatorType": "Join", "Variant": "Join", "JoinColumnIndexes": "L:0", - "TableName": "`user`_user_extra", "Inputs": [ { "OperatorType": "UncorrelatedSubquery", @@ -2852,8 +2732,7 @@ "Sharded": true }, "FieldQuery": "select col from `user` where 1 != 1", - "Query": "select col from `user` limit 1", - "Table": "`user`" + "Query": "select col from `user` limit 1" } ] }, @@ -2866,8 +2745,7 @@ "Sharded": true }, "FieldQuery": "select t.a from (select :__sq1 /* INT16 */ as a from `user` where 1 != 1) as t where 1 != 1", - "Query": "select t.a from (select :__sq1 /* INT16 */ as a from `user`) as t", - "Table": "`user`" + "Query": "select t.a from (select :__sq1 /* INT16 */ as a from `user`) as t" } ] }, @@ -2879,8 +2757,7 @@ "Sharded": true }, "FieldQuery": "select 1 from user_extra where 1 != 1", - "Query": "select 1 from user_extra", - "Table": "user_extra" + "Query": "select 1 from user_extra" } ] }, @@ -2902,7 +2779,6 @@ "OperatorType": "Join", "Variant": "Join", "JoinColumnIndexes": "L:0", - "TableName": "`user`_user_extra", "Inputs": [ { "OperatorType": "UncorrelatedSubquery", @@ -2924,8 +2800,7 @@ "Sharded": true }, "FieldQuery": "select col from `user` where 1 != 1", - "Query": "select col from `user` limit 1", - "Table": "`user`" + "Query": "select col from `user` limit 1" } ] }, @@ -2938,8 +2813,7 @@ "Sharded": true }, "FieldQuery": "select :__sq1 /* INT16 */ as a from `user` where 1 != 1", - "Query": "select :__sq1 /* INT16 */ as a from `user`", - "Table": "`user`" + "Query": "select :__sq1 /* INT16 */ as a from `user`" } ] }, @@ -2951,8 +2825,7 @@ "Sharded": true }, "FieldQuery": "select 1 from user_extra where 1 != 1", - "Query": "select 1 from user_extra", - "Table": "user_extra" + "Query": "select 1 from user_extra" } ] }, @@ -3000,7 +2873,6 @@ "JoinVars": { "user_id": 0 }, - "TableName": "`user`_user_extra", "Inputs": [ { "OperatorType": "Route", @@ -3010,8 +2882,7 @@ "Sharded": true }, "FieldQuery": "select `user`.id from `user` where 1 != 1", - "Query": "select `user`.id from `user`", - "Table": "`user`" + "Query": "select `user`.id from `user`" }, { "OperatorType": "Route", @@ -3021,8 +2892,7 @@ "Sharded": true }, "FieldQuery": "select :user_id * user_id as amount from user_extra where 1 != 1", - "Query": "select :user_id * user_id as amount from user_extra", - "Table": "user_extra" + "Query": "select :user_id * user_id as amount from user_extra" } ] }, @@ -3047,7 +2917,6 @@ "JoinVars": { "user_id": 0 }, - "TableName": "`user`_user_extra", "Inputs": [ { "OperatorType": "Route", @@ -3057,8 +2926,7 @@ "Sharded": true }, "FieldQuery": "select `user`.id from `user` where 1 != 1", - "Query": "select `user`.id from `user`", - "Table": "`user`" + "Query": "select `user`.id from `user`" }, { "OperatorType": "Route", @@ -3068,8 +2936,7 @@ "Sharded": true }, "FieldQuery": "select user_extra.user_id from user_extra where 1 != 1", - "Query": "select user_extra.user_id from user_extra where user_extra.foo = :user_id", - "Table": "user_extra" + "Query": "select user_extra.user_id from user_extra where user_extra.foo = :user_id" } ] }, @@ -3131,8 +2998,7 @@ "Sharded": true }, "FieldQuery": "select sum(col) from `user` where 1 != 1", - "Query": "select sum(col) from `user`", - "Table": "`user`" + "Query": "select sum(col) from `user`" } ] }, @@ -3145,8 +3011,7 @@ "Sharded": true }, "FieldQuery": "select CAST(:__sq1 AS DECIMAL(0, 0)) as `(select sum(col) from ``user``)` from user_extra where 1 != 1", - "Query": "select CAST(:__sq1 AS DECIMAL(0, 0)) as `(select sum(col) from ``user``)` from user_extra", - "Table": "user_extra" + "Query": "select CAST(:__sq1 AS DECIMAL(0, 0)) as `(select sum(col) from ``user``)` from user_extra" } ] }, @@ -3172,8 +3037,7 @@ "Sharded": true }, "FieldQuery": "select `user`.id, user_extra.user_id from `user` straight_join user_extra on `user`.id = user_extra.user_id where 1 != 1", - "Query": "select `user`.id, user_extra.user_id from `user` straight_join user_extra on `user`.id = user_extra.user_id", - "Table": "`user`, user_extra" + "Query": "select `user`.id, user_extra.user_id from `user` straight_join user_extra on `user`.id = user_extra.user_id" }, "TablesUsed": [ "user.user", @@ -3201,7 +3065,6 @@ "JoinVars": { "user_id": 1 }, - "TableName": "`user`_user_extra", "Inputs": [ { "InputName": "Outer", @@ -3212,8 +3075,7 @@ "Sharded": true }, "FieldQuery": "select col, `user`.id from `user` where 1 != 1", - "Query": "select col, `user`.id from `user`", - "Table": "`user`" + "Query": "select col, `user`.id from `user`" }, { "InputName": "SubQuery", @@ -3225,7 +3087,6 @@ }, "FieldQuery": "select 1 from user_extra where 1 != 1", "Query": "select 1 from user_extra where user_id = 3 and user_id < :user_id limit 1", - "Table": "user_extra", "Values": [ "3" ], @@ -3261,7 +3122,6 @@ "JoinVars": { "user_id": 1 }, - "TableName": "`user`_user_extra", "Inputs": [ { "InputName": "Outer", @@ -3273,8 +3133,7 @@ }, "FieldQuery": "select col, `user`.id from `user` where 1 != 1", "OrderBy": "0 ASC", - "Query": "select col, `user`.id from `user` order by `user`.col asc", - "Table": "`user`" + "Query": "select col, `user`.id from `user` order by `user`.col asc" }, { "InputName": "SubQuery", @@ -3286,7 +3145,6 @@ }, "FieldQuery": "select 1 from user_extra where 1 != 1", "Query": "select 1 from user_extra where user_id = 3 and user_id < :user_id limit 1", - "Table": "user_extra", "Values": [ "3" ], @@ -3317,7 +3175,6 @@ "JoinVars": { "u1_col": 1 }, - "TableName": "`user`_`user`_user_extra", "Inputs": [ { "OperatorType": "Route", @@ -3327,15 +3184,13 @@ "Sharded": true }, "FieldQuery": "select 1, u1.col from `user` as u1 where 1 != 1", - "Query": "select 1, u1.col from `user` as u1", - "Table": "`user`" + "Query": "select 1, u1.col from `user` as u1" }, { "OperatorType": "SemiJoin", "JoinVars": { "u2_col": 0 }, - "TableName": "`user`_user_extra", "Inputs": [ { "InputName": "Outer", @@ -3346,8 +3201,7 @@ "Sharded": true }, "FieldQuery": "select u2.col from `user` as u2 where 1 != 1", - "Query": "select u2.col from `user` as u2", - "Table": "`user`" + "Query": "select u2.col from `user` as u2" }, { "InputName": "SubQuery", @@ -3362,8 +3216,7 @@ "Sharded": true }, "FieldQuery": "select 1 from user_extra as ue where 1 != 1", - "Query": "select 1 from user_extra as ue where ue.col = :u1_col /* INT16 */ and ue.col = :u2_col /* INT16 */ limit 1", - "Table": "user_extra" + "Query": "select 1 from user_extra as ue where ue.col = :u1_col /* INT16 */ and ue.col = :u2_col /* INT16 */ limit 1" } ] } @@ -3394,7 +3247,6 @@ "JoinVars": { "u_col": 1 }, - "TableName": "`user`_user_extra", "Inputs": [ { "InputName": "Outer", @@ -3405,8 +3257,7 @@ "Sharded": true }, "FieldQuery": "select 1, u.col from `user` as u where 1 != 1", - "Query": "select 1, u.col from `user` as u", - "Table": "`user`" + "Query": "select 1, u.col from `user` as u" }, { "InputName": "SubQuery", @@ -3421,8 +3272,7 @@ "Sharded": true }, "FieldQuery": "select 1 from user_extra as ue where 1 != 1", - "Query": "select 1 from user_extra as ue where ue.col = :u_col /* INT16 */ and ue.col2 = :u_col /* INT16 */ limit 1", - "Table": "user_extra" + "Query": "select 1 from user_extra as ue where ue.col = :u_col /* INT16 */ and ue.col2 = :u_col /* INT16 */ limit 1" } ] } @@ -3453,7 +3303,6 @@ }, "FieldQuery": "select music.id from music, `user` where 1 != 1", "Query": "select music.id from music, `user` where music.user_id = 5 and music.user_id = `user`.id and music.id = (select max(m2.id) from music as m2 where m2.user_id = `user`.id)", - "Table": "`user`, music", "Values": [ "5" ], @@ -3480,8 +3329,7 @@ "Sharded": true }, "FieldQuery": "select 0 from `user` as u, user_extra as s, music as m where 1 != 1", - "Query": "select 0 from `user` as u, user_extra as s, music as m where u.id = s.user_id and m.user_id = u.id and (s.foo or m.bar)", - "Table": "`user`, music, user_extra" + "Query": "select 0 from `user` as u, user_extra as s, music as m where u.id = s.user_id and m.user_id = u.id and (s.foo or m.bar)" }, "TablesUsed": [ "user.music", @@ -3509,8 +3357,7 @@ "Sharded": true }, "FieldQuery": "select id as `found` from `user` where 1 != 1", - "Query": "select id as `found` from `user`", - "Table": "`user`" + "Query": "select id as `found` from `user`" }, { "OperatorType": "Route", @@ -3520,8 +3367,7 @@ "Sharded": false }, "FieldQuery": "select id from unsharded where 1 != 1", - "Query": "select id from unsharded", - "Table": "unsharded" + "Query": "select id from unsharded" } ] }, @@ -3546,7 +3392,6 @@ "user_extra_col": 0, "user_extra_id": 1 }, - "TableName": "user_extra_`user`", "Inputs": [ { "OperatorType": "Route", @@ -3556,8 +3401,7 @@ "Sharded": true }, "FieldQuery": "select user_extra.col, user_extra.id from user_extra where 1 != 1", - "Query": "select user_extra.col, user_extra.id from user_extra", - "Table": "user_extra" + "Query": "select user_extra.col, user_extra.id from user_extra" }, { "OperatorType": "Route", @@ -3568,7 +3412,6 @@ }, "FieldQuery": "select :user_extra_col /* INT16 */ + `user`.col as `user_extra.col + ``user``.col` from `user` where 1 != 1", "Query": "select :user_extra_col /* INT16 */ + `user`.col as `user_extra.col + ``user``.col` from `user` where `user`.id = :user_extra_id", - "Table": "`user`", "Values": [ ":user_extra_id" ], @@ -3598,8 +3441,7 @@ "Sharded": false }, "FieldQuery": "select 1 from (select col from unsharded where 1 != 1) as f left join unsharded as u on f.col = u.id where 1 != 1", - "Query": "select 1 from (select col from unsharded order by unsharded.col1 desc limit 0, 12) as f left join unsharded as u on f.col = u.id", - "Table": "unsharded" + "Query": "select 1 from (select col from unsharded order by unsharded.col1 desc limit 0, 12) as f left join unsharded as u on f.col = u.id" }, "TablesUsed": [ "main.unsharded" @@ -3622,8 +3464,7 @@ "Sharded": false }, "FieldQuery": "select 1 from (select col, count(*) as a from unsharded where 1 != 1 group by col) as f left join unsharded as u on f.col = u.id where 1 != 1", - "Query": "select 1 from (select col, count(*) as a from unsharded group by col having a > 0 limit 0, 12) as f left join unsharded as u on f.col = u.id", - "Table": "unsharded" + "Query": "select 1 from (select col, count(*) as a from unsharded group by col having a > 0 limit 0, 12) as f left join unsharded as u on f.col = u.id" }, "TablesUsed": [ "main.unsharded" @@ -3646,8 +3487,7 @@ "Sharded": true }, "FieldQuery": "select `user`.id, trim(leading 'x' from `user`.`name`) from `user` where 1 != 1", - "Query": "select `user`.id, trim(leading 'x' from `user`.`name`) from `user`", - "Table": "`user`" + "Query": "select `user`.id, trim(leading 'x' from `user`.`name`) from `user`" }, "TablesUsed": [ "user.user" @@ -3670,8 +3510,7 @@ "Sharded": true }, "FieldQuery": "select jcol, json_storage_size(jcol), json_storage_free(jcol), json_pretty(jcol) from `user` where 1 != 1", - "Query": "select jcol, json_storage_size(jcol), json_storage_free(jcol), json_pretty(jcol) from `user`", - "Table": "`user`" + "Query": "select jcol, json_storage_size(jcol), json_storage_free(jcol), json_pretty(jcol) from `user`" }, "TablesUsed": [ "user.user" @@ -3696,8 +3535,7 @@ "FieldQuery": "select 1 from dual where 1 != 1", "Query": "select 1 from dual where exists (select 1 from information_schema.`TABLES` where `TABLES`.`TABLE_NAME` = :TABLES_TABLE_NAME /* VARCHAR */ and `TABLES`.TABLE_SCHEMA = :__vtschemaname /* VARCHAR */)", "SysTableTableName": "[TABLES_TABLE_NAME:'proc']", - "SysTableTableSchema": "['mysql']", - "Table": "dual" + "SysTableTableSchema": "['mysql']" }, "TablesUsed": [ "main.dual" @@ -3719,8 +3557,7 @@ "Sharded": false }, "FieldQuery": "select json_quote('null'), json_quote('\"null\"'), json_object(BIN(1), 2, 'abc', ASCII(4)), json_array(1, 'abc', null, true, curtime()) from dual where 1 != 1", - "Query": "select json_quote('null'), json_quote('\"null\"'), json_object(BIN(1), 2, 'abc', ASCII(4)), json_array(1, 'abc', null, true, curtime()) from dual", - "Table": "dual" + "Query": "select json_quote('null'), json_quote('\"null\"'), json_object(BIN(1), 2, 'abc', ASCII(4)), json_array(1, 'abc', null, true, curtime()) from dual" }, "TablesUsed": [ "main.dual" @@ -3755,8 +3592,7 @@ }, "FieldQuery": "select id, weight_string(id) from `user` where 1 != 1", "OrderBy": "(0|1) ASC", - "Query": "select id, weight_string(id) from `user` order by `user`.id asc limit 1", - "Table": "`user`" + "Query": "select id, weight_string(id) from `user` order by `user`.id asc limit 1" } ] }, @@ -3769,8 +3605,7 @@ "Sharded": true }, "FieldQuery": "select :__sq1 as `(select id from ``user`` order by ``user``.id asc limit 1)` from user_extra where 1 != 1", - "Query": "select :__sq1 as `(select id from ``user`` order by ``user``.id asc limit 1)` from user_extra", - "Table": "user_extra" + "Query": "select :__sq1 as `(select id from ``user`` order by ``user``.id asc limit 1)` from user_extra" } ] }, @@ -3797,7 +3632,6 @@ }, "FieldQuery": "select exists (select 1 from dual where 1 != 1) from `user` where 1 != 1", "Query": "select exists (select 1 from dual) from `user` where id = 5", - "Table": "`user`", "Values": [ "5" ], @@ -3824,8 +3658,7 @@ "Sharded": false }, "FieldQuery": "select json_schema_valid('{\"type\":\"string\",\"pattern\":\"(\"}', '\"abc\"'), json_schema_validation_report('{\"type\":\"string\",\"pattern\":\"(\"}', '\"abc\"') from dual where 1 != 1", - "Query": "select json_schema_valid('{\"type\":\"string\",\"pattern\":\"(\"}', '\"abc\"'), json_schema_validation_report('{\"type\":\"string\",\"pattern\":\"(\"}', '\"abc\"') from dual", - "Table": "dual" + "Query": "select json_schema_valid('{\"type\":\"string\",\"pattern\":\"(\"}', '\"abc\"'), json_schema_validation_report('{\"type\":\"string\",\"pattern\":\"(\"}', '\"abc\"') from dual" }, "TablesUsed": [ "main.dual" @@ -3847,8 +3680,7 @@ "Sharded": false }, "FieldQuery": "select json_contains('{\"a\": 1, \"b\": 2, \"c\": {\"d\": 4}}', '1'), json_contains_path('{\"a\": 1, \"b\": 2, \"c\": {\"d\": 4}}', 'one', '$.a', '$.e'), json_extract('[10, 20, [30, 40]]', '$[1]'), json_unquote(json_extract('[\"a\",\"b\"]', '$[1]')), json_keys('{\"a\": 1, \"b\": {\"c\": 30}}'), json_overlaps('[1,3,5,7]', '[2,5,7]'), json_search('[\"abc\"]', 'one', 'abc'), json_value('{\"fname\": \"Joe\", \"lname\": \"Palmer\"}', '$.fname'), json_array(4, 5) member of ('[[3,4],[4,5]]') from dual where 1 != 1", - "Query": "select json_contains('{\"a\": 1, \"b\": 2, \"c\": {\"d\": 4}}', '1'), json_contains_path('{\"a\": 1, \"b\": 2, \"c\": {\"d\": 4}}', 'one', '$.a', '$.e'), json_extract('[10, 20, [30, 40]]', '$[1]'), json_unquote(json_extract('[\"a\",\"b\"]', '$[1]')), json_keys('{\"a\": 1, \"b\": {\"c\": 30}}'), json_overlaps('[1,3,5,7]', '[2,5,7]'), json_search('[\"abc\"]', 'one', 'abc'), json_value('{\"fname\": \"Joe\", \"lname\": \"Palmer\"}', '$.fname'), json_array(4, 5) member of ('[[3,4],[4,5]]') from dual", - "Table": "dual" + "Query": "select json_contains('{\"a\": 1, \"b\": 2, \"c\": {\"d\": 4}}', '1'), json_contains_path('{\"a\": 1, \"b\": 2, \"c\": {\"d\": 4}}', 'one', '$.a', '$.e'), json_extract('[10, 20, [30, 40]]', '$[1]'), json_unquote(json_extract('[\"a\",\"b\"]', '$[1]')), json_keys('{\"a\": 1, \"b\": {\"c\": 30}}'), json_overlaps('[1,3,5,7]', '[2,5,7]'), json_search('[\"abc\"]', 'one', 'abc'), json_value('{\"fname\": \"Joe\", \"lname\": \"Palmer\"}', '$.fname'), json_array(4, 5) member of ('[[3,4],[4,5]]') from dual" }, "TablesUsed": [ "main.dual" @@ -3870,8 +3702,7 @@ "Sharded": true }, "FieldQuery": "select json_extract(a, '$[4]'), json_unquote(json_extract(a, '$[3]')) from `user` where 1 != 1", - "Query": "select json_extract(a, '$[4]'), json_unquote(json_extract(a, '$[3]')) from `user`", - "Table": "`user`" + "Query": "select json_extract(a, '$[4]'), json_unquote(json_extract(a, '$[3]')) from `user`" }, "TablesUsed": [ "user.user" @@ -3894,8 +3725,7 @@ "Sharded": true }, "FieldQuery": "select u.id, u.age from `user` as u where 1 != 1 group by u.id", - "Query": "select u.id, u.age from `user` as u group by u.id", - "Table": "`user`" + "Query": "select u.id, u.age from `user` as u group by u.id" }, "TablesUsed": [ "user.user" @@ -3918,8 +3748,7 @@ "Sharded": false }, "FieldQuery": "select json_depth('{}'), json_length('{\"a\": 1, \"b\": {\"c\": 30}}', '$.b'), json_type(json_extract('{\"a\": [10, true]}', '$.a')), json_valid('{\"a\": 1}') from dual where 1 != 1", - "Query": "select json_depth('{}'), json_length('{\"a\": 1, \"b\": {\"c\": 30}}', '$.b'), json_type(json_extract('{\"a\": [10, true]}', '$.a')), json_valid('{\"a\": 1}') from dual", - "Table": "dual" + "Query": "select json_depth('{}'), json_length('{\"a\": 1, \"b\": {\"c\": 30}}', '$.b'), json_type(json_extract('{\"a\": [10, true]}', '$.a')), json_valid('{\"a\": 1}') from dual" }, "TablesUsed": [ "main.dual" @@ -3941,8 +3770,7 @@ "Sharded": false }, "FieldQuery": "select json_array_append('{\"a\": 1}', '$', 'z'), json_array_insert('[\"a\", {\"b\": [1, 2]}, [3, 4]]', '$[0]', 'x', '$[2][1]', 'y'), json_insert('{ \"a\": 1, \"b\": [2, 3]}', '$.a', 10, '$.c', cast('[true, false]' as JSON)) from dual where 1 != 1", - "Query": "select json_array_append('{\"a\": 1}', '$', 'z'), json_array_insert('[\"a\", {\"b\": [1, 2]}, [3, 4]]', '$[0]', 'x', '$[2][1]', 'y'), json_insert('{ \"a\": 1, \"b\": [2, 3]}', '$.a', 10, '$.c', cast('[true, false]' as JSON)) from dual", - "Table": "dual" + "Query": "select json_array_append('{\"a\": 1}', '$', 'z'), json_array_insert('[\"a\", {\"b\": [1, 2]}, [3, 4]]', '$[0]', 'x', '$[2][1]', 'y'), json_insert('{ \"a\": 1, \"b\": [2, 3]}', '$.a', 10, '$.c', cast('[true, false]' as JSON)) from dual" }, "TablesUsed": [ "main.dual" @@ -3964,8 +3792,7 @@ "Sharded": false }, "FieldQuery": "select json_merge('[1, 2]', '[true, false]'), json_merge_patch('{\"name\": \"x\"}', '{\"id\": 47}'), json_merge_preserve('[1, 2]', '{\"id\": 47}') from dual where 1 != 1", - "Query": "select json_merge('[1, 2]', '[true, false]'), json_merge_patch('{\"name\": \"x\"}', '{\"id\": 47}'), json_merge_preserve('[1, 2]', '{\"id\": 47}') from dual", - "Table": "dual" + "Query": "select json_merge('[1, 2]', '[true, false]'), json_merge_patch('{\"name\": \"x\"}', '{\"id\": 47}'), json_merge_preserve('[1, 2]', '{\"id\": 47}') from dual" }, "TablesUsed": [ "main.dual" @@ -3987,8 +3814,7 @@ "Sharded": false }, "FieldQuery": "select json_remove('[1, [2, 3], 4]', '$[1]'), json_replace('{ \"a\": 1, \"b\": [2, 3]}', '$.a', 10, '$.c', '[true, false]'), json_set('{ \"a\": 1, \"b\": [2, 3]}', '$.a', 10, '$.c', '[true, false]'), json_unquote('\"abc\"') from dual where 1 != 1", - "Query": "select json_remove('[1, [2, 3], 4]', '$[1]'), json_replace('{ \"a\": 1, \"b\": [2, 3]}', '$.a', 10, '$.c', '[true, false]'), json_set('{ \"a\": 1, \"b\": [2, 3]}', '$.a', 10, '$.c', '[true, false]'), json_unquote('\"abc\"') from dual", - "Table": "dual" + "Query": "select json_remove('[1, [2, 3], 4]', '$[1]'), json_replace('{ \"a\": 1, \"b\": [2, 3]}', '$.a', 10, '$.c', '[true, false]'), json_set('{ \"a\": 1, \"b\": [2, 3]}', '$.a', 10, '$.c', '[true, false]'), json_unquote('\"abc\"') from dual" }, "TablesUsed": [ "main.dual" @@ -4011,7 +3837,6 @@ }, "FieldQuery": "select exists (select 1 from `user` where 1 != 1) from dual where 1 != 1", "Query": "select exists (select 1 from `user` where id = 4) from dual", - "Table": "dual", "Values": [ "4" ], @@ -4047,8 +3872,7 @@ "Sharded": true }, "FieldQuery": "select 1 from `user` where 1 != 1", - "Query": "select 1 from `user`", - "Table": "`user`" + "Query": "select 1 from `user`" }, { "InputName": "Outer", @@ -4059,8 +3883,7 @@ "Sharded": false }, "FieldQuery": "select :__sq_has_values2 as `exists (select 1 from ``user``)` from dual where 1 != 1", - "Query": "select :__sq_has_values2 as `exists (select 1 from ``user``)` from dual", - "Table": "dual" + "Query": "select :__sq_has_values2 as `exists (select 1 from ``user``)` from dual" } ] }, @@ -4108,8 +3931,7 @@ "Sharded": true }, "FieldQuery": "select insert(tcol1, id, 3, tcol2) from `user` where 1 != 1", - "Query": "select insert(tcol1, id, 3, tcol2) from `user`", - "Table": "`user`" + "Query": "select insert(tcol1, id, 3, tcol2) from `user`" }, "TablesUsed": [ "user.user" @@ -4132,8 +3954,7 @@ "Sharded": false }, "FieldQuery": "select gtid_subset('3E11FA47-71CA-11E1-9E33-C80AA9429562:23', '3E11FA47-71CA-11E1-9E33-C80AA9429562:21-57'), gtid_subtract('3E11FA47-71CA-11E1-9E33-C80AA9429562:23', '3E11FA47-71CA-11E1-9E33-C80AA9429562:21-57') from dual where 1 != 1", - "Query": "select gtid_subset('3E11FA47-71CA-11E1-9E33-C80AA9429562:23', '3E11FA47-71CA-11E1-9E33-C80AA9429562:21-57'), gtid_subtract('3E11FA47-71CA-11E1-9E33-C80AA9429562:23', '3E11FA47-71CA-11E1-9E33-C80AA9429562:21-57') from dual", - "Table": "dual" + "Query": "select gtid_subset('3E11FA47-71CA-11E1-9E33-C80AA9429562:23', '3E11FA47-71CA-11E1-9E33-C80AA9429562:21-57'), gtid_subtract('3E11FA47-71CA-11E1-9E33-C80AA9429562:23', '3E11FA47-71CA-11E1-9E33-C80AA9429562:21-57') from dual" }, "TablesUsed": [ "main.dual" @@ -4154,7 +3975,6 @@ "JoinVars": { "user_col": 0 }, - "TableName": "`user`_user_extra, user_metadata", "Inputs": [ { "OperatorType": "Route", @@ -4164,8 +3984,7 @@ "Sharded": true }, "FieldQuery": "select `user`.col from `user` where 1 != 1", - "Query": "select `user`.col from `user` where `user`.textcol1 = 'alice@gmail.com'", - "Table": "`user`" + "Query": "select `user`.col from `user` where `user`.textcol1 = 'alice@gmail.com'" }, { "OperatorType": "Route", @@ -4175,8 +3994,7 @@ "Sharded": true }, "FieldQuery": "select user_metadata.user_id from user_extra, user_metadata where 1 != 1", - "Query": "select user_metadata.user_id from user_extra, user_metadata where user_extra.col = :user_col /* INT16 */ and user_extra.user_id = user_metadata.user_id", - "Table": "user_extra, user_metadata" + "Query": "select user_metadata.user_id from user_extra, user_metadata where user_extra.col = :user_col /* INT16 */ and user_extra.user_id = user_metadata.user_id" } ] }, @@ -4204,7 +4022,6 @@ }, "FieldQuery": "select `user`.id from `user`, music_extra, music where 1 != 1", "Query": "select `user`.id from `user`, music_extra, music where music.id = 456 and `user`.id = 123 and `user`.id = music_extra.user_id and music_extra.user_id = music.user_id", - "Table": "`user`, music, music_extra", "Values": [ "123" ], @@ -4253,7 +4070,6 @@ }, "FieldQuery": "select `name`, keyspace_id from name_user_vdx where 1 != 1", "Query": "select `name`, keyspace_id from name_user_vdx where `name` in ::__vals", - "Table": "name_user_vdx", "Values": [ "::name" ], @@ -4269,8 +4085,7 @@ "FieldQuery": "select id, `name`, weight_string(id) from `user` where 1 != 1", "OrderBy": "(0|2) ASC", "Query": "select id, `name`, weight_string(id) from `user` where `name` = 'aa' order by `user`.id asc limit 2", - "ResultColumns": 2, - "Table": "`user`" + "ResultColumns": 2 } ] } @@ -4302,7 +4117,6 @@ }, "FieldQuery": "select `name`, keyspace_id from name_user_vdx where 1 != 1", "Query": "select `name`, keyspace_id from name_user_vdx where `name` in ::__vals", - "Table": "name_user_vdx", "Values": [ "::name" ], @@ -4316,8 +4130,7 @@ "Sharded": true }, "FieldQuery": "select count(*) from `user` where 1 != 1", - "Query": "select count(*) from `user` where `name` = 'aa'", - "Table": "`user`" + "Query": "select count(*) from `user` where `name` = 'aa'" } ] } @@ -4346,8 +4159,7 @@ "Sharded": true }, "FieldQuery": "select music.id from music, `user` where 1 != 1", - "Query": "select music.id from music, `user` where music.user_id in (null) and `user`.id = 5 and music.user_id = `user`.id", - "Table": "`user`, music" + "Query": "select music.id from music, `user` where music.user_id in (null) and `user`.id = 5 and music.user_id = `user`.id" }, "TablesUsed": [ "user.music", @@ -4371,7 +4183,6 @@ }, "FieldQuery": "select music.id from music where 1 != 1", "Query": "select music.id from music where music.user_id = 5 and music.id in (select music.id from music where music.user_id in (5))", - "Table": "music", "Values": [ "5" ], @@ -4399,7 +4210,6 @@ }, "FieldQuery": "select music.id from music where 1 != 1", "Query": "select music.id from music where music.id in (select music.id from music where music.user_id in (1, 2, 3))", - "Table": "music", "Values": [ "(1, 2, 3)" ], @@ -4426,7 +4236,6 @@ }, "FieldQuery": "select music.id from music where 1 != 1", "Query": "select music.id from music where music.id in (select id from (select music.id from music where music.user_id in (1, 2, 3)) as _inner)", - "Table": "music", "Values": [ "(1, 2, 3)" ], @@ -4453,7 +4262,6 @@ }, "FieldQuery": "select music.id from music where 1 != 1", "Query": "select music.id from music where music.user_id in ::__vals and music.id in (select music.id from music where music.foo = 'bar')", - "Table": "music", "Values": [ "(3, 4, 5)" ], @@ -4481,7 +4289,6 @@ }, "FieldQuery": "select music.id from music where 1 != 1", "Query": "select music.id from music where music.user_id = 5 and music.id in (select music.id from music where music.user_id in (1, 2, 3))", - "Table": "music", "Values": [ "5" ], @@ -4507,8 +4314,7 @@ "Sharded": true }, "FieldQuery": "select music.id from music where 1 != 1", - "Query": "select music.id from music where music.id in (select music.id from music where music.user_id in (1, 2, 3)) or music.user_id = 5", - "Table": "music" + "Query": "select music.id from music where music.id in (select music.id from music where music.user_id in (1, 2, 3)) or music.user_id = 5" }, "TablesUsed": [ "user.music" @@ -4530,8 +4336,7 @@ "Sharded": true }, "FieldQuery": "select music.id from music where 1 != 1", - "Query": "select music.id from music where music.user_id = 5 and music.id in (select music.id from music where music.user_id in (null))", - "Table": "music" + "Query": "select music.id from music where music.user_id = 5 and music.id in (select music.id from music where music.user_id in (null))" }, "TablesUsed": [ "user.music" @@ -4553,8 +4358,7 @@ "Sharded": true }, "FieldQuery": "select music.id from music where 1 != 1", - "Query": "select music.id from music where music.id in (select music.id from music where music.user_id in (null)) or music.user_id = 5", - "Table": "music" + "Query": "select music.id from music where music.id in (select music.id from music where music.user_id in (null)) or music.user_id = 5" }, "TablesUsed": [ "user.music" @@ -4576,8 +4380,7 @@ "Sharded": true }, "FieldQuery": "select music.id from music where 1 != 1", - "Query": "select music.id from music where music.id in (select music.id from music where music.genre = 'pop')", - "Table": "music" + "Query": "select music.id from music where music.id in (select music.id from music where music.genre = 'pop')" }, "TablesUsed": [ "user.music" @@ -4600,8 +4403,7 @@ "Sharded": true }, "FieldQuery": "select music.id from music where 1 != 1", - "Query": "select music.id from music where music.id in (select music.id from music where music.genre = 'pop' group by music.id)", - "Table": "music" + "Query": "select music.id from music where music.id in (select music.id from music where music.genre = 'pop' group by music.id)" }, "TablesUsed": [ "user.music" @@ -4640,8 +4442,7 @@ }, "FieldQuery": "select music.id, music.genre, weight_string(music.genre) from music where 1 != 1 group by music.genre, weight_string(music.genre)", "OrderBy": "(1|2) ASC", - "Query": "select music.id, music.genre, weight_string(music.genre) from music where music.genre = 'pop' group by music.genre, weight_string(music.genre) order by music.genre asc", - "Table": "music" + "Query": "select music.id, music.genre, weight_string(music.genre) from music where music.genre = 'pop' group by music.genre, weight_string(music.genre) order by music.genre asc" } ] }, @@ -4667,7 +4468,6 @@ }, "FieldQuery": "select `name`, keyspace_id from name_user_vdx where 1 != 1", "Query": "select `name`, keyspace_id from name_user_vdx where `name` in ::__vals", - "Table": "name_user_vdx", "Values": [ "::name" ], @@ -4681,8 +4481,7 @@ "Sharded": true }, "FieldQuery": "select music.id from music where 1 != 1", - "Query": "select music.id from music where :__sq_has_values and music.id in ::__vals", - "Table": "music" + "Query": "select music.id from music where :__sq_has_values and music.id in ::__vals" } ] } @@ -4722,8 +4521,7 @@ "Sharded": true }, "FieldQuery": "select music.id from music where 1 != 1", - "Query": "select music.id from music where music.genre = 'pop' limit 10", - "Table": "music" + "Query": "select music.id from music where music.genre = 'pop' limit 10" } ] }, @@ -4749,7 +4547,6 @@ }, "FieldQuery": "select `name`, keyspace_id from name_user_vdx where 1 != 1", "Query": "select `name`, keyspace_id from name_user_vdx where `name` in ::__vals", - "Table": "name_user_vdx", "Values": [ "::name" ], @@ -4763,8 +4560,7 @@ "Sharded": true }, "FieldQuery": "select music.id from music where 1 != 1", - "Query": "select music.id from music where :__sq_has_values and music.id in ::__vals", - "Table": "music" + "Query": "select music.id from music where :__sq_has_values and music.id in ::__vals" } ] } @@ -4801,7 +4597,6 @@ }, "FieldQuery": "select max(music.id) from music where 1 != 1 group by music.user_id", "Query": "select max(music.id) from music where music.user_id in ::__vals group by music.user_id", - "Table": "music", "Values": [ "(5, 6)" ], @@ -4829,7 +4624,6 @@ }, "FieldQuery": "select `name`, keyspace_id from name_user_vdx where 1 != 1", "Query": "select `name`, keyspace_id from name_user_vdx where `name` in ::__vals", - "Table": "name_user_vdx", "Values": [ "::name" ], @@ -4843,8 +4637,7 @@ "Sharded": true }, "FieldQuery": "select music.id from music where 1 != 1", - "Query": "select music.id from music where :__sq_has_values and music.id in ::__vals", - "Table": "music" + "Query": "select music.id from music where :__sq_has_values and music.id in ::__vals" } ] } @@ -4886,7 +4679,6 @@ }, "FieldQuery": "select max(music.id), weight_string(max(music.id)) from music where 1 != 1", "Query": "select max(music.id), weight_string(max(music.id)) from music where music.user_id in ::__vals", - "Table": "music", "Values": [ "(5, 6)" ], @@ -4916,7 +4708,6 @@ }, "FieldQuery": "select `name`, keyspace_id from name_user_vdx where 1 != 1", "Query": "select `name`, keyspace_id from name_user_vdx where `name` in ::__vals", - "Table": "name_user_vdx", "Values": [ "::name" ], @@ -4930,8 +4721,7 @@ "Sharded": true }, "FieldQuery": "select music.id from music where 1 != 1", - "Query": "select music.id from music where :__sq_has_values and music.id in ::__vals", - "Table": "music" + "Query": "select music.id from music where :__sq_has_values and music.id in ::__vals" } ] } @@ -4967,7 +4757,6 @@ }, "FieldQuery": "select max(music.id) from music where 1 != 1", "Query": "select max(music.id) from music where music.user_id = 5", - "Table": "music", "Values": [ "5" ], @@ -4995,7 +4784,6 @@ }, "FieldQuery": "select `name`, keyspace_id from name_user_vdx where 1 != 1", "Query": "select `name`, keyspace_id from name_user_vdx where `name` in ::__vals", - "Table": "name_user_vdx", "Values": [ "::name" ], @@ -5009,8 +4797,7 @@ "Sharded": true }, "FieldQuery": "select music.id from music where 1 != 1", - "Query": "select music.id from music where :__sq_has_values and music.id in ::__vals", - "Table": "music" + "Query": "select music.id from music where :__sq_has_values and music.id in ::__vals" } ] } @@ -5046,7 +4833,6 @@ }, "FieldQuery": "select max(music.id) from music where 1 != 1", "Query": "select max(music.id) from music where music.user_id = 5 limit 10", - "Table": "music", "Values": [ "5" ], @@ -5074,7 +4860,6 @@ }, "FieldQuery": "select `name`, keyspace_id from name_user_vdx where 1 != 1", "Query": "select `name`, keyspace_id from name_user_vdx where `name` in ::__vals", - "Table": "name_user_vdx", "Values": [ "::name" ], @@ -5088,8 +4873,7 @@ "Sharded": true }, "FieldQuery": "select music.id from music where 1 != 1", - "Query": "select music.id from music where :__sq_has_values and music.id in ::__vals", - "Table": "music" + "Query": "select music.id from music where :__sq_has_values and music.id in ::__vals" } ] } @@ -5117,7 +4901,6 @@ }, "FieldQuery": "select music.id from music where 1 != 1", "Query": "select music.id from music where music.id in (select id from (select id from (select music.id from music where music.user_id = 5 limit 10) as subquery_for_limit) as subquery_for_limit)", - "Table": "music", "Values": [ "5" ], @@ -5144,7 +4927,6 @@ }, "FieldQuery": "select music.id from music where 1 != 1", "Query": "select music.id from music where music.id in (select id from (select id from (select music.id from music where music.user_id in (5) limit 10) as subquery_for_limit) as subquery_for_limit)", - "Table": "music", "Values": [ "5" ], @@ -5176,8 +4958,7 @@ }, "FetchLastInsertID": true, "FieldQuery": "select last_insert_id(5) from `user` where 1 != 1", - "Query": "select last_insert_id(5) from `user` limit 12", - "Table": "`user`" + "Query": "select last_insert_id(5) from `user` limit 12" } ] }, @@ -5215,7 +4996,6 @@ }, "FieldQuery": "select id from (select id from (select music.id from music where 1 != 1) as subquery_for_limit where 1 != 1) as subquery_for_limit where 1 != 1", "Query": "select id from (select id from (select music.id from music where music.user_id in ::__vals) as subquery_for_limit limit 10) as subquery_for_limit", - "Table": "music", "Values": [ "(5, 6)" ], @@ -5245,7 +5025,6 @@ }, "FieldQuery": "select `name`, keyspace_id from name_user_vdx where 1 != 1", "Query": "select `name`, keyspace_id from name_user_vdx where `name` in ::__vals", - "Table": "name_user_vdx", "Values": [ "::name" ], @@ -5259,8 +5038,7 @@ "Sharded": true }, "FieldQuery": "select music.id from music where 1 != 1", - "Query": "select music.id from music where :__sq_has_values and music.id in ::__vals", - "Table": "music" + "Query": "select music.id from music where :__sq_has_values and music.id in ::__vals" } ] } @@ -5300,8 +5078,7 @@ "Sharded": true }, "FieldQuery": "select id from (select id from (select music.id from music where 1 != 1) as subquery_for_limit where 1 != 1) as subquery_for_limit where 1 != 1", - "Query": "select id from (select id from (select music.id from music) as subquery_for_limit limit 10) as subquery_for_limit", - "Table": "music" + "Query": "select id from (select id from (select music.id from music) as subquery_for_limit limit 10) as subquery_for_limit" } ] }, @@ -5327,7 +5104,6 @@ }, "FieldQuery": "select `name`, keyspace_id from name_user_vdx where 1 != 1", "Query": "select `name`, keyspace_id from name_user_vdx where `name` in ::__vals", - "Table": "name_user_vdx", "Values": [ "::name" ], @@ -5341,8 +5117,7 @@ "Sharded": true }, "FieldQuery": "select music.id from music where 1 != 1", - "Query": "select music.id from music where :__sq_has_values and music.id in ::__vals", - "Table": "music" + "Query": "select music.id from music where :__sq_has_values and music.id in ::__vals" } ] } @@ -5369,8 +5144,7 @@ "Sharded": true }, "FieldQuery": "select music.id from music where 1 != 1", - "Query": "select music.id from music where music.id in (select music.id from music where music.user_id in (null))", - "Table": "music" + "Query": "select music.id from music where music.id in (select music.id from music where music.user_id in (null))" }, "TablesUsed": [ "user.music" @@ -5392,8 +5166,7 @@ "Sharded": true }, "FieldQuery": "select music.id from music where 1 != 1", - "Query": "select music.id from music where music.user_id = 5 and music.id in (select music.id from music where music.user_id in (null))", - "Table": "music" + "Query": "select music.id from music where music.user_id = 5 and music.id in (select music.id from music where music.user_id in (null))" }, "TablesUsed": [ "user.music" @@ -5415,8 +5188,7 @@ "Sharded": true }, "FieldQuery": "select music.id from music where 1 != 1", - "Query": "select music.id from music where music.id in (select music.id from music where music.user_id in (null)) or music.user_id = 5", - "Table": "music" + "Query": "select music.id from music where music.id in (select music.id from music where music.user_id in (null)) or music.user_id = 5" }, "TablesUsed": [ "user.music" @@ -5439,7 +5211,6 @@ }, "FieldQuery": "select music.id from (select max(id) as maxt from music where 1 != 1) as other, music where 1 != 1", "Query": "select music.id from (select max(id) as maxt from music where music.user_id = 5) as other, music where other.maxt = music.id", - "Table": "music", "Values": [ "5" ], @@ -5466,7 +5237,6 @@ }, "FieldQuery": "select music.id from (select max(id) as maxt from music where 1 != 1) as other, music where 1 != 1", "Query": "select music.id from (select max(id) as maxt from music where music.user_id = 5 and music.col not in (select col from `user` where `user`.id = 5)) as other, music where other.maxt = music.id", - "Table": "music", "Values": [ "5" ], @@ -5493,7 +5263,6 @@ }, "FieldQuery": "select music.id from (select id from music where 1 != 1) as other, music where 1 != 1", "Query": "select music.id from (select id from music where music.user_id = 5) as other, music where other.id = music.id", - "Table": "music", "Values": [ "5" ], @@ -5520,7 +5289,6 @@ }, "FieldQuery": "select music.id from (select id from music where 1 != 1) as other, music where 1 != 1", "Query": "select music.id from (select id from music where music.user_id in ::__vals) as other, music where other.id = music.id", - "Table": "music", "Values": [ "(5, 6, 7)" ], @@ -5545,7 +5313,6 @@ "JoinVars": { "ue_user_id": 0 }, - "TableName": "user_extra_`user`", "Inputs": [ { "OperatorType": "Limit", @@ -5559,8 +5326,7 @@ "Sharded": true }, "FieldQuery": "select ue.user_id from (select user_id from user_extra where 1 != 1) as ue where 1 != 1", - "Query": "select ue.user_id from (select user_id from user_extra) as ue limit 10", - "Table": "user_extra" + "Query": "select ue.user_id from (select user_id from user_extra) as ue limit 10" } ] }, @@ -5573,7 +5339,6 @@ }, "FieldQuery": "select id from `user` where 1 != 1", "Query": "select id from `user` where `user`.id = :ue_user_id", - "Table": "`user`", "Values": [ ":ue_user_id" ], @@ -5602,7 +5367,6 @@ "JoinVars": { "t_id": 1 }, - "TableName": "user_extra_`user`", "Inputs": [ { "OperatorType": "SimpleProjection", @@ -5623,8 +5387,7 @@ }, "FieldQuery": "select id, count(*) as b, req, weight_string(req), weight_string(id) from user_extra where 1 != 1 group by req, id, weight_string(req), weight_string(id)", "OrderBy": "(2|3) ASC, (0|4) ASC", - "Query": "select id, count(*) as b, req, weight_string(req), weight_string(id) from user_extra group by req, id, weight_string(req), weight_string(id) order by req asc, id asc", - "Table": "user_extra" + "Query": "select id, count(*) as b, req, weight_string(req), weight_string(id) from user_extra group by req, id, weight_string(req), weight_string(id) order by req asc, id asc" } ] } @@ -5639,7 +5402,6 @@ }, "FieldQuery": "select `user`.a from `user` where 1 != 1", "Query": "select `user`.a from `user` where `user`.id = :t_id", - "Table": "`user`", "Values": [ ":t_id" ], @@ -5670,7 +5432,6 @@ }, "FieldQuery": "select music.id from (select max(id) as maxt from music where 1 != 1) as other, music where 1 != 1", "Query": "select music.id from (select max(id) as maxt from music where music.user_id = 5) as other, music where other.maxt = music.id", - "Table": "music", "Values": [ "5" ], @@ -5696,8 +5457,7 @@ "Sharded": false }, "FieldQuery": "select 1 as x, (select x from dual where 1 != 1) from dual where 1 != 1", - "Query": "select 1 as x, (select x from dual) from dual", - "Table": "dual" + "Query": "select 1 as x, (select x from dual) from dual" }, "TablesUsed": [ "main.dual" @@ -5720,7 +5480,6 @@ }, "FieldQuery": "select * from `user` where 1 != 1", "Query": "select * from `user` where id = 1", - "Table": "`user`", "Values": [ "1" ], @@ -5747,7 +5506,6 @@ }, "FieldQuery": "select * from `user` where 1 != 1", "Query": "select * from `user` where id = 1", - "Table": "`user`", "Values": [ "1" ], @@ -5773,8 +5531,7 @@ "Sharded": false }, "FieldQuery": "select * from unsharded_a as t1 join (select trim((select max(`name`) from unsharded_a where 1 != 1)) as `name` from dual where 1 != 1) as t2 where 1 != 1", - "Query": "select * from unsharded_a as t1 join (select trim((select max(`name`) from unsharded_a)) as `name` from dual) as t2 where t1.`name` >= t2.`name` order by t1.`name` asc limit 1", - "Table": "dual, unsharded_a" + "Query": "select * from unsharded_a as t1 join (select trim((select max(`name`) from unsharded_a)) as `name` from dual) as t2 where t1.`name` >= t2.`name` order by t1.`name` asc limit 1" }, "TablesUsed": [ "main.dual", @@ -5799,7 +5556,6 @@ }, "FieldQuery": "select (select 1 from `user` as u1 join `user` as u2 on u1.id = u2.id and u1.id = u3.id where 1 != 1) as subquery from `user` as u3 where 1 != 1", "Query": "select (select 1 from `user` as u1 join `user` as u2 on u1.id = u2.id and u1.id = u3.id) as subquery from `user` as u3 where u3.id = 1", - "Table": "`user`", "Values": [ "1" ], @@ -5825,8 +5581,7 @@ "Sharded": false }, "FieldQuery": "select 1 from unsharded where 1 != 1", - "Query": "select 1 from unsharded where foo = any (select 1 from unsharded_a where foo = 1)", - "Table": "unsharded, unsharded_a" + "Query": "select 1 from unsharded where foo = any (select 1 from unsharded_a where foo = 1)" }, "TablesUsed": [ "main.unsharded", @@ -5850,8 +5605,7 @@ "Sharded": false }, "FieldQuery": "select 1 from unsharded where 1 != 1", - "Query": "select 1 from unsharded where foo = all (select 1 from unsharded_a where foo = 1)", - "Table": "unsharded, unsharded_a" + "Query": "select 1 from unsharded where foo = all (select 1 from unsharded_a where foo = 1)" }, "TablesUsed": [ "main.unsharded", @@ -5876,8 +5630,7 @@ }, "FetchLastInsertID": true, "FieldQuery": "select last_insert_id(id) from `user` where 1 != 1", - "Query": "select last_insert_id(id) from `user`", - "Table": "`user`" + "Query": "select last_insert_id(id) from `user`" }, "TablesUsed": [ "user.user" @@ -5899,8 +5652,7 @@ "Sharded": true }, "FieldQuery": "select 1 from `user`, music_extra where 1 != 1", - "Query": "select 1 from `user`, music_extra where `user`.id = music_extra.user_id and music_extra.music_id = (select max(music_id) from music_extra where user_id = `user`.id)", - "Table": "`user`, music_extra" + "Query": "select 1 from `user`, music_extra where `user`.id = music_extra.user_id and music_extra.music_id = (select max(music_id) from music_extra where user_id = `user`.id)" }, "TablesUsed": [ "user.music_extra", @@ -5925,7 +5677,6 @@ }, "FieldQuery": "select * from user_metadata where 1 != 1", "Query": "select * from user_metadata where user_metadata.non_planable = 'foo'", - "Table": "user_metadata", "Values": [ "'foo'" ], @@ -5965,7 +5716,6 @@ }, "FieldQuery": "select `name`, keyspace_id from name_user_vdx where 1 != 1", "Query": "select `name`, keyspace_id from name_user_vdx where `name` in ::__vals", - "Table": "name_user_vdx", "Values": [ "::name" ], @@ -5979,8 +5729,7 @@ "Sharded": true }, "FieldQuery": "select u.id from `user` as u, user_metadata as um where 1 != 1", - "Query": "select u.id from `user` as u, user_metadata as um where u.`name` = 'foo' and u.id = um.user_id", - "Table": "`user`, user_metadata" + "Query": "select u.id from `user` as u, user_metadata as um where u.`name` = 'foo' and u.id = um.user_id" } ] }, @@ -6019,7 +5768,6 @@ }, "FieldQuery": "select unq_key, keyspace_id from unq_lkp_idx where 1 != 1", "Query": "select unq_key, keyspace_id from unq_lkp_idx where unq_key in ::__vals", - "Table": "unq_lkp_idx", "Values": [ "::unq_key" ], @@ -6033,8 +5781,7 @@ "Sharded": true }, "FieldQuery": "select * from customer where 1 != 1", - "Query": "select * from customer where email = 'a@mail.com'", - "Table": "customer" + "Query": "select * from customer where email = 'a@mail.com'" } ] }, @@ -6058,8 +5805,7 @@ "Sharded": true }, "FieldQuery": "select * from customer where 1 != 1", - "Query": "select * from customer where phone = 123456", - "Table": "customer" + "Query": "select * from customer where phone = 123456" }, "TablesUsed": [ "user.customer" @@ -6081,8 +5827,7 @@ "Sharded": true }, "FieldQuery": "select * from customer where 1 != 1", - "Query": "select * from customer where `name` = 'x'", - "Table": "customer" + "Query": "select * from customer where `name` = 'x'" }, "TablesUsed": [ "user.customer" @@ -6118,7 +5863,6 @@ }, "FieldQuery": "select unq_key, keyspace_id from unq_lkp_idx where 1 != 1", "Query": "select unq_key, keyspace_id from unq_lkp_idx where unq_key in ::__vals", - "Table": "unq_lkp_idx", "Values": [ "::unq_key" ], @@ -6132,8 +5876,7 @@ "Sharded": true }, "FieldQuery": "select * from customer where 1 != 1", - "Query": "select * from customer where email = 'a@mail.com' and phone = 123456", - "Table": "customer" + "Query": "select * from customer where email = 'a@mail.com' and phone = 123456" } ] }, @@ -6170,7 +5913,6 @@ }, "FieldQuery": "select unq_key, keyspace_id from unq_lkp_idx where 1 != 1", "Query": "select unq_key, keyspace_id from unq_lkp_idx where unq_key in ::__vals", - "Table": "unq_lkp_idx", "Values": [ "::unq_key" ], @@ -6184,8 +5926,7 @@ "Sharded": true }, "FieldQuery": "select * from customer where 1 != 1", - "Query": "select * from customer where phone = 123456 and email = 'a@mail.com'", - "Table": "customer" + "Query": "select * from customer where phone = 123456 and email = 'a@mail.com'" } ] }, @@ -6209,8 +5950,7 @@ "Sharded": true }, "FieldQuery": "select col from samecolvin where 1 != 1", - "Query": "select col from samecolvin where secret = 12", - "Table": "samecolvin" + "Query": "select col from samecolvin where secret = 12" }, "TablesUsed": [ "user.samecolvin" @@ -6229,7 +5969,6 @@ "OperatorType": "Join", "Variant": "Join", "JoinColumnIndexes": "L:0,R:0", - "TableName": "`user`_user_extra", "Inputs": [ { "OperatorType": "Route", @@ -6240,8 +5979,7 @@ }, "FieldQuery": "select u.foo, weight_string(u.foo) from `user` as u where 1 != 1", "OrderBy": "(0|1) ASC", - "Query": "select u.foo, weight_string(u.foo) from `user` as u order by u.foo asc", - "Table": "`user`" + "Query": "select u.foo, weight_string(u.foo) from `user` as u order by u.foo asc" }, { "OperatorType": "Route", @@ -6251,8 +5989,7 @@ "Sharded": true }, "FieldQuery": "select ue.foo as apa from user_extra as ue where 1 != 1", - "Query": "select ue.foo as apa from user_extra as ue", - "Table": "user_extra" + "Query": "select ue.foo as apa from user_extra as ue" } ] }, @@ -6277,7 +6014,6 @@ "JoinVars": { "tables_table_name": 0 }, - "TableName": "unsharded_`user`", "Inputs": [ { "OperatorType": "Route", @@ -6287,8 +6023,7 @@ "Sharded": false }, "FieldQuery": "select `tables`.`table_name` from (select `table_name` from unsharded where 1 != 1) as `tables` where 1 != 1", - "Query": "select `tables`.`table_name` from (select `table_name` from unsharded limit 1) as `tables`", - "Table": "unsharded" + "Query": "select `tables`.`table_name` from (select `table_name` from unsharded limit 1) as `tables`" }, { "OperatorType": "Route", @@ -6298,8 +6033,7 @@ "Sharded": true }, "FieldQuery": "select c.`column_name` from `user` as c where 1 != 1", - "Query": "select c.`column_name` from `user` as c where c.`table_name` = :tables_table_name", - "Table": "`user`" + "Query": "select c.`column_name` from `user` as c where c.`table_name` = :tables_table_name" } ] }, @@ -6332,7 +6066,6 @@ "JoinVars": { "user_cola": 2 }, - "TableName": "`user`_user_extra", "Inputs": [ { "OperatorType": "Route", @@ -6342,8 +6075,7 @@ "Sharded": true }, "FieldQuery": "select `name` as t0, `name` as t1, `user`.cola from `user` where 1 != 1", - "Query": "select `name` as t0, `name` as t1, `user`.cola from `user`", - "Table": "`user`" + "Query": "select `name` as t0, `name` as t1, `user`.cola from `user`" }, { "OperatorType": "Route", @@ -6353,8 +6085,7 @@ "Sharded": true }, "FieldQuery": "select 1 from user_extra where 1 != 1", - "Query": "select 1 from user_extra where user_extra.cola = :user_cola", - "Table": "user_extra" + "Query": "select 1 from user_extra where user_extra.cola = :user_cola" } ] } @@ -6382,8 +6113,7 @@ "Sharded": false }, "FieldQuery": "select val, cume_dist() over w, row_number() over w, dense_rank() over w, percent_rank() over w, rank() over w as cd from unsharded_a where 1 != 1", - "Query": "select val, cume_dist() over w, row_number() over w, dense_rank() over w, percent_rank() over w, rank() over w as cd from unsharded_a", - "Table": "unsharded_a" + "Query": "select val, cume_dist() over w, row_number() over w, dense_rank() over w, percent_rank() over w, rank() over w as cd from unsharded_a" }, "TablesUsed": [ "main.unsharded_a" @@ -6407,7 +6137,6 @@ }, "FieldQuery": "select sum(id) over ( partition by `name`) from `user` where 1 != 1", "Query": "select sum(id) over ( partition by `name`) from `user` where id = 5", - "Table": "`user`", "Values": [ "5" ], @@ -6433,8 +6162,7 @@ "Sharded": true }, "FieldQuery": "select 1 from (select id as uid from `user` where 1 != 1) as t, `user` where 1 != 1", - "Query": "select 1 from (select id as uid from `user`) as t, `user` where t.uid = `user`.id", - "Table": "`user`" + "Query": "select 1 from (select id as uid from `user`) as t, `user` where t.uid = `user`.id" }, "TablesUsed": [ "user.user" diff --git a/go/vt/vtgate/planbuilder/testdata/select_cases_with_default.json b/go/vt/vtgate/planbuilder/testdata/select_cases_with_default.json index 6404076a2f4..9008a89efdc 100644 --- a/go/vt/vtgate/planbuilder/testdata/select_cases_with_default.json +++ b/go/vt/vtgate/planbuilder/testdata/select_cases_with_default.json @@ -15,7 +15,6 @@ }, "FieldQuery": "select exists (select 1 from `user` where 1 != 1) from dual where 1 != 1", "Query": "select exists (select 1 from `user` where id = 5) from dual", - "Table": "dual", "Values": [ "5" ], diff --git a/go/vt/vtgate/planbuilder/testdata/select_cases_with_user_as_default.json b/go/vt/vtgate/planbuilder/testdata/select_cases_with_user_as_default.json index a59d0e50c18..73722364f07 100644 --- a/go/vt/vtgate/planbuilder/testdata/select_cases_with_user_as_default.json +++ b/go/vt/vtgate/planbuilder/testdata/select_cases_with_user_as_default.json @@ -15,7 +15,6 @@ }, "FieldQuery": "select exists (select 1 from `user` where 1 != 1) from dual where 1 != 1", "Query": "select exists (select 1 from `user` where id = 5) from dual", - "Table": "dual", "Values": [ "5" ], diff --git a/go/vt/vtgate/planbuilder/testdata/symtab_cases.json b/go/vt/vtgate/planbuilder/testdata/symtab_cases.json index cef8b200441..c555fbc1e20 100644 --- a/go/vt/vtgate/planbuilder/testdata/symtab_cases.json +++ b/go/vt/vtgate/planbuilder/testdata/symtab_cases.json @@ -13,7 +13,6 @@ "JoinVars": { "predef2": 0 }, - "TableName": "`user`_unsharded", "Inputs": [ { "OperatorType": "Route", @@ -23,8 +22,7 @@ "Sharded": true }, "FieldQuery": "select predef2 from `user` where 1 != 1", - "Query": "select predef2 from `user`", - "Table": "`user`" + "Query": "select predef2 from `user`" }, { "OperatorType": "Route", @@ -34,8 +32,7 @@ "Sharded": false }, "FieldQuery": "select predef3 from unsharded where 1 != 1", - "Query": "select predef3 from unsharded where predef3 = :predef2", - "Table": "unsharded" + "Query": "select predef3 from unsharded where predef3 = :predef2" } ] }, diff --git a/go/vt/vtgate/planbuilder/testdata/sysschema_default.json b/go/vt/vtgate/planbuilder/testdata/sysschema_default.json index bc5c23a08b2..fbfaabef581 100644 --- a/go/vt/vtgate/planbuilder/testdata/sysschema_default.json +++ b/go/vt/vtgate/planbuilder/testdata/sysschema_default.json @@ -14,8 +14,7 @@ "Sharded": false }, "FieldQuery": "select @@max_allowed_packet from dual where 1 != 1", - "Query": "select @@max_allowed_packet from dual", - "Table": "dual" + "Query": "select @@max_allowed_packet from dual" }, "TablesUsed": [ "main.dual" @@ -38,8 +37,7 @@ }, "FieldQuery": "select t.table_schema, t.`table_name`, c.`column_name`, c.column_type from information_schema.`tables` as t, information_schema.`columns` as c where 1 != 1", "Query": "select t.table_schema, t.`table_name`, c.`column_name`, c.column_type from information_schema.`tables` as t, information_schema.`columns` as c where t.table_schema = :__vtschemaname /* VARCHAR */ and c.table_schema = :__vtschemaname /* VARCHAR */ and c.table_schema = t.table_schema and c.`table_name` = t.`table_name` order by t.table_schema asc, t.`table_name` asc, c.`column_name` asc", - "SysTableTableSchema": "['user']", - "Table": "information_schema.`columns`, information_schema.`tables`" + "SysTableTableSchema": "['user']" } } }, @@ -59,8 +57,7 @@ }, "FieldQuery": "select (select 1 from information_schema.schemata where 1 != 1) as `(select 1 from information_schema.schemata where ``schema_name`` = 'MyDatabase' limit 1)` from dual where 1 != 1", "Query": "select (select 1 from information_schema.schemata where `schema_name` = :__vtschemaname /* VARCHAR */ limit 1) as `(select 1 from information_schema.schemata where ``schema_name`` = 'MyDatabase' limit 1)` from dual", - "SysTableTableSchema": "['MyDatabase']", - "Table": "dual" + "SysTableTableSchema": "['MyDatabase']" }, "TablesUsed": [ "main.dual" @@ -83,8 +80,7 @@ }, "FieldQuery": "select `1` from (select 1 from information_schema.schemata where 1 != 1) as x where 1 != 1", "Query": "select `1` from (select 1 from information_schema.schemata where `schema_name` = :__vtschemaname /* VARCHAR */ limit 1) as x", - "SysTableTableSchema": "['MyDatabase']", - "Table": "information_schema.schemata" + "SysTableTableSchema": "['MyDatabase']" } } } diff --git a/go/vt/vtgate/planbuilder/testdata/tpcc_cases.json b/go/vt/vtgate/planbuilder/testdata/tpcc_cases.json index 8345b55e936..d8ffcc3ee9d 100644 --- a/go/vt/vtgate/planbuilder/testdata/tpcc_cases.json +++ b/go/vt/vtgate/planbuilder/testdata/tpcc_cases.json @@ -15,7 +15,6 @@ }, "FieldQuery": "select c_discount, c_last, c_credit, w_tax from customer1 as c, warehouse1 as w where 1 != 1", "Query": "select c_discount, c_last, c_credit, w_tax from customer1 as c, warehouse1 as w where c_d_id = 15 and c_id = 10 and w_id = 1 and c_w_id = w_id", - "Table": "customer1, warehouse1", "Values": [ "1" ], @@ -43,7 +42,6 @@ }, "FieldQuery": "select d_next_o_id, d_tax from district1 where 1 != 1", "Query": "select d_next_o_id, d_tax from district1 where d_w_id = 15 and d_id = 95 for update", - "Table": "district1", "Values": [ "15" ], @@ -69,7 +67,6 @@ "Sharded": true }, "Query": "update district1 set d_next_o_id = 56 where d_id = 9842 and d_w_id = 8546", - "Table": "district1", "Values": [ "8546" ], @@ -95,7 +92,6 @@ "Sharded": true }, "Query": "insert into orders1(o_id, o_d_id, o_w_id, o_c_id, o_entry_d, o_ol_cnt, o_all_local) values (334983, 59896, :_o_w_id_0, 156, now(), 781038, 'hello')", - "TableName": "orders1", "VindexValues": { "hash": "99" } @@ -120,7 +116,6 @@ "Sharded": true }, "Query": "insert into new_orders1(no_o_id, no_d_id, no_w_id) values (8, 9, :_no_w_id_0)", - "TableName": "new_orders1", "VindexValues": { "hash": "48" } @@ -146,7 +141,6 @@ }, "FieldQuery": "select i_price, i_name, i_data from item1 where 1 != 1", "Query": "select i_price, i_name, i_data from item1 where i_id = 9654", - "Table": "item1", "Values": [ "9654" ], @@ -173,7 +167,6 @@ }, "FieldQuery": "select s_quantity, s_data, s_dist_01 as s_dist from stock1 where 1 != 1", "Query": "select s_quantity, s_data, s_dist_01 as s_dist from stock1 where s_i_id = 2198 and s_w_id = 89 for update", - "Table": "stock1", "Values": [ "89" ], @@ -199,7 +192,6 @@ "Sharded": true }, "Query": "update stock1 set s_quantity = 894 where s_i_id = 156 and s_w_id = 6", - "Table": "stock1", "Values": [ "6" ], @@ -225,7 +217,6 @@ "Sharded": true }, "Query": "insert into order_line1(ol_o_id, ol_d_id, ol_w_id, ol_number, ol_i_id, ol_supply_w_id, ol_quantity, ol_amount, ol_dist_info) values (648, 36812, :_ol_w_id_0, 4946378, 3, 7, 89, 1, 'info')", - "TableName": "order_line1", "VindexValues": { "hash": "3201" } @@ -250,7 +241,6 @@ "Sharded": true }, "Query": "update warehouse1 set w_ytd = w_ytd + 946879 where w_id = 3", - "Table": "warehouse1", "Values": [ "3" ], @@ -277,7 +267,6 @@ }, "FieldQuery": "select w_street_1, w_street_2, w_city, w_state, w_zip, w_name from warehouse1 where 1 != 1", "Query": "select w_street_1, w_street_2, w_city, w_state, w_zip, w_name from warehouse1 where w_id = 998", - "Table": "warehouse1", "Values": [ "998" ], @@ -303,7 +292,6 @@ "Sharded": true }, "Query": "update district1 set d_ytd = d_ytd + 2 where d_w_id = 89 and d_id = 9", - "Table": "district1", "Values": [ "89" ], @@ -330,7 +318,6 @@ }, "FieldQuery": "select d_street_1, d_street_2, d_city, d_state, d_zip, d_name from district1 where 1 != 1", "Query": "select d_street_1, d_street_2, d_city, d_state, d_zip, d_name from district1 where d_w_id = 896 and d_id = 9", - "Table": "district1", "Values": [ "896" ], @@ -357,7 +344,6 @@ }, "FieldQuery": "select count(c_id) as namecnt from customer1 where 1 != 1", "Query": "select count(c_id) as namecnt from customer1 where c_w_id = 5 and c_d_id = 1 and c_last = 'last'", - "Table": "customer1", "Values": [ "5" ], @@ -384,7 +370,6 @@ }, "FieldQuery": "select c_id from customer1 where 1 != 1", "Query": "select c_id from customer1 where c_w_id = 8 and c_d_id = 5 and c_last = 'item_last' order by c_first asc", - "Table": "customer1", "Values": [ "8" ], @@ -411,7 +396,6 @@ }, "FieldQuery": "select c_first, c_middle, c_last, c_street_1, c_street_2, c_city, c_state, c_zip, c_phone, c_credit, c_credit_lim, c_discount, c_balance, c_ytd_payment, c_since from customer1 where 1 != 1", "Query": "select c_first, c_middle, c_last, c_street_1, c_street_2, c_city, c_state, c_zip, c_phone, c_credit, c_credit_lim, c_discount, c_balance, c_ytd_payment, c_since from customer1 where c_w_id = 8965 and c_d_id = 1 and c_id = 9 for update", - "Table": "customer1", "Values": [ "8965" ], @@ -438,7 +422,6 @@ }, "FieldQuery": "select c_data from customer1 where 1 != 1", "Query": "select c_data from customer1 where c_w_id = 32 and c_d_id = 68 and c_id = 5", - "Table": "customer1", "Values": [ "32" ], @@ -464,7 +447,6 @@ "Sharded": true }, "Query": "update customer1 set c_balance = 508.98, c_ytd_payment = 48941.980301, c_data = 'i am data' where c_w_id = 20 and c_d_id = 387 and c_id = 98", - "Table": "customer1", "Values": [ "20" ], @@ -490,7 +472,6 @@ "Sharded": true }, "Query": "update customer1 set c_balance = 508.98, c_ytd_payment = 48941.980301 where c_w_id = 20 and c_d_id = 387 and c_id = 98", - "Table": "customer1", "Values": [ "20" ], @@ -516,7 +497,6 @@ "Sharded": true }, "Query": "insert into history1(h_c_d_id, h_c_w_id, h_c_id, h_d_id, h_w_id, h_date, h_amount, h_data) values (6809887, 38748, 8746, 210, :_h_w_id_0, now(), 8907, 'data')", - "TableName": "history1", "VindexValues": { "hash": "8" } @@ -542,7 +522,6 @@ }, "FieldQuery": "select count(c_id) as namecnt from customer1 where 1 != 1", "Query": "select count(c_id) as namecnt from customer1 where c_w_id = 870 and c_d_id = 780 and c_last = 'last'", - "Table": "customer1", "Values": [ "870" ], @@ -569,7 +548,6 @@ }, "FieldQuery": "select c_balance, c_first, c_middle, c_id from customer1 where 1 != 1", "Query": "select c_balance, c_first, c_middle, c_id from customer1 where c_w_id = 840 and c_d_id = 1 and c_last = 'test' order by customer1.c_first asc", - "Table": "customer1", "Values": [ "840" ], @@ -596,7 +574,6 @@ }, "FieldQuery": "select c_balance, c_first, c_middle, c_last from customer1 where 1 != 1", "Query": "select c_balance, c_first, c_middle, c_last from customer1 where c_w_id = 15 and c_d_id = 5169 and c_id = 1", - "Table": "customer1", "Values": [ "15" ], @@ -623,7 +600,6 @@ }, "FieldQuery": "select o_id, o_carrier_id, o_entry_d from orders1 where 1 != 1", "Query": "select o_id, o_carrier_id, o_entry_d from orders1 where o_w_id = 9894 and o_d_id = 3 and o_c_id = 159 order by orders1.o_id desc", - "Table": "orders1", "Values": [ "9894" ], @@ -650,7 +626,6 @@ }, "FieldQuery": "select ol_i_id, ol_supply_w_id, ol_quantity, ol_amount, ol_delivery_d from order_line1 where 1 != 1", "Query": "select ol_i_id, ol_supply_w_id, ol_quantity, ol_amount, ol_delivery_d from order_line1 where ol_w_id = 92 and ol_d_id = 5 and ol_o_id = 1", - "Table": "order_line1", "Values": [ "92" ], @@ -677,7 +652,6 @@ }, "FieldQuery": "select no_o_id from new_orders1 where 1 != 1", "Query": "select no_o_id from new_orders1 where no_d_id = 689 and no_w_id = 15 order by new_orders1.no_o_id asc limit 1 for update", - "Table": "new_orders1", "Values": [ "15" ], @@ -703,7 +677,6 @@ "Sharded": true }, "Query": "delete from new_orders1 where no_o_id = 2218 and no_d_id = 358 and no_w_id = 98465", - "Table": "new_orders1", "Values": [ "98465" ], @@ -730,7 +703,6 @@ }, "FieldQuery": "select o_c_id from orders1 where 1 != 1", "Query": "select o_c_id from orders1 where o_id = 6 and o_d_id = 1983 and o_w_id = 894605", - "Table": "orders1", "Values": [ "894605" ], @@ -756,7 +728,6 @@ "Sharded": true }, "Query": "update orders1 set o_carrier_id = 9 where o_id = 56 and o_d_id = 98 and o_w_id = 897", - "Table": "orders1", "Values": [ "897" ], @@ -782,7 +753,6 @@ "Sharded": true }, "Query": "update order_line1 set ol_delivery_d = now() where ol_o_id = 235 and ol_d_id = 315 and ol_w_id = 8", - "Table": "order_line1", "Values": [ "8" ], @@ -809,7 +779,6 @@ }, "FieldQuery": "select sum(ol_amount) as sm from order_line1 where 1 != 1", "Query": "select sum(ol_amount) as sm from order_line1 where ol_o_id = 680 and ol_d_id = 201 and ol_w_id = 87", - "Table": "order_line1", "Values": [ "87" ], @@ -835,7 +804,6 @@ "Sharded": true }, "Query": "update customer1 set c_balance = c_balance + 988.01, c_delivery_cnt = c_delivery_cnt + 1 where c_id = 6 and c_d_id = 5 and c_w_id = 160", - "Table": "customer1", "Values": [ "160" ], @@ -862,7 +830,6 @@ }, "FieldQuery": "select d_next_o_id from district1 where 1 != 1", "Query": "select d_next_o_id from district1 where d_id = 6 and d_w_id = 21", - "Table": "district1", "Values": [ "21" ], @@ -889,7 +856,6 @@ }, "FieldQuery": "select count(distinct s.s_i_id) from stock1 as s, order_line1 as ol where 1 != 1", "Query": "select count(distinct s.s_i_id) from stock1 as s, order_line1 as ol where s.s_w_id = 12 and s.s_quantity < 10 and ol.ol_w_id = 12 and ol.ol_d_id = 1908 and ol.ol_o_id < 30 and ol.ol_o_id >= 15 and ol.ol_w_id = s.s_w_id and ol.ol_i_id = s.s_i_id", - "Table": "order_line1, stock1", "Values": [ "12" ], @@ -917,7 +883,6 @@ }, "FieldQuery": "select ol_i_id from order_line1 where 1 != 1", "Query": "select distinct ol_i_id from order_line1 where ol_w_id = 1 and ol_d_id = 156 and ol_o_id < 500 and ol_o_id >= 56", - "Table": "order_line1", "Values": [ "1" ], @@ -944,7 +909,6 @@ }, "FieldQuery": "select count(*) from stock1 where 1 != 1", "Query": "select count(*) from stock1 where s_w_id = 1 and s_i_id = 8 and s_quantity < 1000", - "Table": "stock1", "Values": [ "1" ], @@ -971,7 +935,6 @@ }, "FieldQuery": "select o.o_id, o.o_d_id from (select o_c_id, o_w_id, o_d_id, count(distinct o_w_id), o_id from orders1 where 1 != 1 group by o_c_id, o_d_id, o_w_id) as t, orders1 as o where 1 != 1", "Query": "select o.o_id, o.o_d_id from (select o_c_id, o_w_id, o_d_id, count(distinct o_w_id), o_id from orders1 where o_w_id = 1 and o_id > 2100 and o_id < 11153 group by o_c_id, o_d_id, o_w_id having count(distinct o_id) > 1 limit 1) as t, orders1 as o where t.o_w_id = o.o_w_id and t.o_d_id = o.o_d_id and t.o_c_id = o.o_c_id limit 1", - "Table": "orders1", "Values": [ "1" ], @@ -997,7 +960,6 @@ "Sharded": true }, "Query": "delete from order_line1 where ol_w_id = 178 and ol_d_id = 1 and ol_o_id = 84", - "Table": "order_line1", "Values": [ "178" ], @@ -1023,7 +985,6 @@ "Sharded": true }, "Query": "delete from orders1 where o_w_id = 1 and o_d_id = 3 and o_id = 384", - "Table": "orders1", "Values": [ "1" ], @@ -1049,7 +1010,6 @@ "Sharded": true }, "Query": "delete from history1 where h_w_id = 75 and h_d_id = 102 limit 10", - "Table": "history1", "Values": [ "75" ], diff --git a/go/vt/vtgate/planbuilder/testdata/tpch_cases.json b/go/vt/vtgate/planbuilder/testdata/tpch_cases.json index 06c2c77511c..19d34e64332 100644 --- a/go/vt/vtgate/planbuilder/testdata/tpch_cases.json +++ b/go/vt/vtgate/planbuilder/testdata/tpch_cases.json @@ -36,8 +36,7 @@ }, "FieldQuery": "select l_returnflag, l_linestatus, sum(l_quantity) as sum_qty, sum(l_extendedprice) as sum_base_price, sum(l_extendedprice * (1 - l_discount)) as sum_disc_price, sum(l_extendedprice * (1 - l_discount) * (1 + l_tax)) as sum_charge, sum(l_quantity) as avg_qty, sum(l_extendedprice) as avg_price, sum(l_discount) as avg_disc, count(*) as count_order, count(l_quantity), count(l_extendedprice), count(l_discount), weight_string(l_returnflag), weight_string(l_linestatus) from lineitem where 1 != 1 group by l_returnflag, l_linestatus, weight_string(l_returnflag), weight_string(l_linestatus)", "OrderBy": "(0|13) ASC, (1|14) ASC", - "Query": "select l_returnflag, l_linestatus, sum(l_quantity) as sum_qty, sum(l_extendedprice) as sum_base_price, sum(l_extendedprice * (1 - l_discount)) as sum_disc_price, sum(l_extendedprice * (1 - l_discount) * (1 + l_tax)) as sum_charge, sum(l_quantity) as avg_qty, sum(l_extendedprice) as avg_price, sum(l_discount) as avg_disc, count(*) as count_order, count(l_quantity), count(l_extendedprice), count(l_discount), weight_string(l_returnflag), weight_string(l_linestatus) from lineitem where l_shipdate <= '1998-12-01' - interval '108' day group by l_returnflag, l_linestatus, weight_string(l_returnflag), weight_string(l_linestatus) order by lineitem.l_returnflag asc, lineitem.l_linestatus asc", - "Table": "lineitem" + "Query": "select l_returnflag, l_linestatus, sum(l_quantity) as sum_qty, sum(l_extendedprice) as sum_base_price, sum(l_extendedprice * (1 - l_discount)) as sum_disc_price, sum(l_extendedprice * (1 - l_discount) * (1 + l_tax)) as sum_charge, sum(l_quantity) as avg_qty, sum(l_extendedprice) as avg_price, sum(l_discount) as avg_disc, count(*) as count_order, count(l_quantity), count(l_extendedprice), count(l_discount), weight_string(l_returnflag), weight_string(l_linestatus) from lineitem where l_shipdate <= '1998-12-01' - interval '108' day group by l_returnflag, l_linestatus, weight_string(l_returnflag), weight_string(l_linestatus) order by lineitem.l_returnflag asc, lineitem.l_linestatus asc" } ] } @@ -100,7 +99,6 @@ "JoinVars": { "l_orderkey": 1 }, - "TableName": "lineitem_orders_customer", "Inputs": [ { "OperatorType": "Route", @@ -110,8 +108,7 @@ "Sharded": true }, "FieldQuery": "select sum(l_extendedprice * (1 - l_discount)) as revenue, l_orderkey, weight_string(l_orderkey) from lineitem where 1 != 1 group by l_orderkey, weight_string(l_orderkey)", - "Query": "select sum(l_extendedprice * (1 - l_discount)) as revenue, l_orderkey, weight_string(l_orderkey) from lineitem where l_shipdate > date('1995-03-15') group by l_orderkey, weight_string(l_orderkey)", - "Table": "lineitem" + "Query": "select sum(l_extendedprice * (1 - l_discount)) as revenue, l_orderkey, weight_string(l_orderkey) from lineitem where l_shipdate > date('1995-03-15') group by l_orderkey, weight_string(l_orderkey)" }, { "OperatorType": "Projection", @@ -130,7 +127,6 @@ "JoinVars": { "o_custkey": 3 }, - "TableName": "orders_customer", "Inputs": [ { "OperatorType": "Route", @@ -141,7 +137,6 @@ }, "FieldQuery": "select count(*), o_orderdate, o_shippriority, o_custkey, weight_string(o_orderdate), weight_string(o_shippriority) from orders where 1 != 1 group by o_orderdate, o_shippriority, o_custkey, weight_string(o_orderdate), weight_string(o_shippriority)", "Query": "select count(*), o_orderdate, o_shippriority, o_custkey, weight_string(o_orderdate), weight_string(o_shippriority) from orders where o_orderdate < date('1995-03-15') and o_orderkey = :l_orderkey group by o_orderdate, o_shippriority, o_custkey, weight_string(o_orderdate), weight_string(o_shippriority)", - "Table": "orders", "Values": [ ":l_orderkey" ], @@ -156,7 +151,6 @@ }, "FieldQuery": "select count(*) from customer where 1 != 1 group by .0", "Query": "select count(*) from customer where c_mktsegment = 'BUILDING' and c_custkey = :o_custkey group by .0", - "Table": "customer", "Values": [ ":o_custkey" ], @@ -204,7 +198,6 @@ "JoinVars": { "o_orderkey": 2 }, - "TableName": "orders_lineitem", "Inputs": [ { "InputName": "Outer", @@ -216,8 +209,7 @@ }, "FieldQuery": "select o_orderpriority, count(*) as order_count, o_orderkey, weight_string(o_orderpriority) from orders where 1 != 1 group by o_orderpriority, o_orderkey, weight_string(o_orderpriority)", "OrderBy": "(0|3) ASC", - "Query": "select o_orderpriority, count(*) as order_count, o_orderkey, weight_string(o_orderpriority) from orders where o_orderdate >= date('1993-07-01') and o_orderdate < date('1993-07-01') + interval '3' month group by o_orderpriority, o_orderkey, weight_string(o_orderpriority) order by orders.o_orderpriority asc", - "Table": "orders" + "Query": "select o_orderpriority, count(*) as order_count, o_orderkey, weight_string(o_orderpriority) from orders where o_orderdate >= date('1993-07-01') and o_orderdate < date('1993-07-01') + interval '3' month group by o_orderpriority, o_orderkey, weight_string(o_orderpriority) order by orders.o_orderpriority asc" }, { "InputName": "SubQuery", @@ -241,7 +233,6 @@ }, "FieldQuery": "select l_orderkey, l_linenumber from lineitem_map where 1 != 1", "Query": "select l_orderkey, l_linenumber from lineitem_map where l_orderkey in ::__vals", - "Table": "lineitem_map", "Values": [ "::l_orderkey" ], @@ -255,8 +246,7 @@ "Sharded": true }, "FieldQuery": "select 1 from lineitem where 1 != 1", - "Query": "select 1 from lineitem where l_orderkey = :o_orderkey and l_commitdate < l_receiptdate limit 1", - "Table": "lineitem" + "Query": "select 1 from lineitem where l_orderkey = :o_orderkey and l_commitdate < l_receiptdate limit 1" } ] } @@ -309,7 +299,6 @@ "JoinVars": { "s_nationkey": 1 }, - "TableName": "orders_customer_lineitem_supplier_nation_region", "Inputs": [ { "OperatorType": "Projection", @@ -326,7 +315,6 @@ "c_nationkey": 2, "o_orderkey": 1 }, - "TableName": "orders_customer_lineitem_supplier", "Inputs": [ { "OperatorType": "Projection", @@ -343,7 +331,6 @@ "JoinVars": { "o_custkey": 2 }, - "TableName": "orders_customer", "Inputs": [ { "OperatorType": "Route", @@ -353,8 +340,7 @@ "Sharded": true }, "FieldQuery": "select count(*), o_orderkey, o_custkey from orders where 1 != 1 group by o_orderkey, o_custkey", - "Query": "select count(*), o_orderkey, o_custkey from orders where o_orderdate >= date('1994-01-01') and o_orderdate < date('1994-01-01') + interval '1' year group by o_orderkey, o_custkey", - "Table": "orders" + "Query": "select count(*), o_orderkey, o_custkey from orders where o_orderdate >= date('1994-01-01') and o_orderdate < date('1994-01-01') + interval '1' year group by o_orderkey, o_custkey" }, { "OperatorType": "Route", @@ -365,7 +351,6 @@ }, "FieldQuery": "select count(*), c_nationkey from customer where 1 != 1 group by c_nationkey", "Query": "select count(*), c_nationkey from customer where c_custkey = :o_custkey group by c_nationkey", - "Table": "customer", "Values": [ ":o_custkey" ], @@ -389,7 +374,6 @@ "JoinVars": { "l_suppkey": 1 }, - "TableName": "lineitem_supplier", "Inputs": [ { "OperatorType": "VindexLookup", @@ -412,7 +396,6 @@ }, "FieldQuery": "select l_orderkey, l_linenumber from lineitem_map where 1 != 1", "Query": "select l_orderkey, l_linenumber from lineitem_map where l_orderkey in ::__vals", - "Table": "lineitem_map", "Values": [ "::l_orderkey" ], @@ -426,8 +409,7 @@ "Sharded": true }, "FieldQuery": "select sum(l_extendedprice * (1 - l_discount)) as revenue, l_suppkey from lineitem where 1 != 1 group by l_suppkey", - "Query": "select sum(l_extendedprice * (1 - l_discount)) as revenue, l_suppkey from lineitem where l_orderkey = :o_orderkey group by l_suppkey", - "Table": "lineitem" + "Query": "select sum(l_extendedprice * (1 - l_discount)) as revenue, l_suppkey from lineitem where l_orderkey = :o_orderkey group by l_suppkey" } ] }, @@ -440,7 +422,6 @@ }, "FieldQuery": "select count(*), s_nationkey from supplier where 1 != 1 group by s_nationkey", "Query": "select count(*), s_nationkey from supplier where s_nationkey = :c_nationkey and s_suppkey = :l_suppkey group by s_nationkey", - "Table": "supplier", "Values": [ ":l_suppkey" ], @@ -469,7 +450,6 @@ "JoinVars": { "n_regionkey": 2 }, - "TableName": "nation_region", "Inputs": [ { "OperatorType": "Route", @@ -480,7 +460,6 @@ }, "FieldQuery": "select count(*), n_name, n_regionkey, weight_string(n_name) from nation where 1 != 1 group by n_name, n_regionkey, weight_string(n_name)", "Query": "select count(*), n_name, n_regionkey, weight_string(n_name) from nation where n_nationkey = :s_nationkey group by n_name, n_regionkey, weight_string(n_name)", - "Table": "nation", "Values": [ ":s_nationkey" ], @@ -495,7 +474,6 @@ }, "FieldQuery": "select count(*) from region where 1 != 1 group by .0", "Query": "select count(*) from region where r_name = 'ASIA' and r_regionkey = :n_regionkey group by .0", - "Table": "region", "Values": [ ":n_regionkey" ], @@ -545,8 +523,7 @@ "Sharded": true }, "FieldQuery": "select sum(l_extendedprice * l_discount) as revenue from lineitem where 1 != 1", - "Query": "select sum(l_extendedprice * l_discount) as revenue from lineitem where l_shipdate >= date('1994-01-01') and l_shipdate < date('1994-01-01') + interval '1' year and l_discount between 0.06 - 0.01 and 0.06 + 0.01 and l_quantity < 24", - "Table": "lineitem" + "Query": "select sum(l_extendedprice * l_discount) as revenue from lineitem where l_shipdate >= date('1994-01-01') and l_shipdate < date('1994-01-01') + interval '1' year and l_discount between 0.06 - 0.01 and 0.06 + 0.01 and l_quantity < 24" } ] }, @@ -594,7 +571,6 @@ "n1_n_name": 1, "o_custkey": 3 }, - "TableName": "lineitem_orders_supplier_nation_customer_nation", "Inputs": [ { "OperatorType": "Projection", @@ -614,7 +590,6 @@ "JoinVars": { "l_suppkey": 3 }, - "TableName": "lineitem_orders_supplier_nation", "Inputs": [ { "OperatorType": "Projection", @@ -633,7 +608,6 @@ "JoinVars": { "l_orderkey": 3 }, - "TableName": "lineitem_orders", "Inputs": [ { "OperatorType": "Route", @@ -643,8 +617,7 @@ "Sharded": true }, "FieldQuery": "select sum(volume) as revenue, l_year, shipping.l_suppkey, shipping.l_orderkey, weight_string(l_year) from (select extract(year from l_shipdate) as l_year, l_extendedprice * (1 - l_discount) as volume, l_suppkey as l_suppkey, l_orderkey as l_orderkey from lineitem where 1 != 1) as shipping where 1 != 1 group by l_year, shipping.l_suppkey, shipping.l_orderkey, weight_string(l_year)", - "Query": "select sum(volume) as revenue, l_year, shipping.l_suppkey, shipping.l_orderkey, weight_string(l_year) from (select extract(year from l_shipdate) as l_year, l_extendedprice * (1 - l_discount) as volume, l_suppkey as l_suppkey, l_orderkey as l_orderkey from lineitem where l_shipdate between date('1995-01-01') and date('1996-12-31')) as shipping group by l_year, shipping.l_suppkey, shipping.l_orderkey, weight_string(l_year)", - "Table": "lineitem" + "Query": "select sum(volume) as revenue, l_year, shipping.l_suppkey, shipping.l_orderkey, weight_string(l_year) from (select extract(year from l_shipdate) as l_year, l_extendedprice * (1 - l_discount) as volume, l_suppkey as l_suppkey, l_orderkey as l_orderkey from lineitem where l_shipdate between date('1995-01-01') and date('1996-12-31')) as shipping group by l_year, shipping.l_suppkey, shipping.l_orderkey, weight_string(l_year)" }, { "OperatorType": "Route", @@ -655,7 +628,6 @@ }, "FieldQuery": "select count(*), shipping.o_custkey from (select o_custkey as o_custkey from orders where 1 != 1) as shipping where 1 != 1 group by shipping.o_custkey", "Query": "select count(*), shipping.o_custkey from (select o_custkey as o_custkey from orders where o_orderkey = :l_orderkey) as shipping group by shipping.o_custkey", - "Table": "orders", "Values": [ ":l_orderkey" ], @@ -680,7 +652,6 @@ "JoinVars": { "s_nationkey": 1 }, - "TableName": "supplier_nation", "Inputs": [ { "OperatorType": "Route", @@ -691,7 +662,6 @@ }, "FieldQuery": "select count(*), shipping.s_nationkey from (select s_nationkey as s_nationkey from supplier where 1 != 1) as shipping where 1 != 1 group by shipping.s_nationkey", "Query": "select count(*), shipping.s_nationkey from (select s_nationkey as s_nationkey from supplier where s_suppkey = :l_suppkey) as shipping group by shipping.s_nationkey", - "Table": "supplier", "Values": [ ":l_suppkey" ], @@ -706,7 +676,6 @@ }, "FieldQuery": "select count(*), supp_nation, weight_string(supp_nation) from (select n1.n_name as supp_nation from nation as n1 where 1 != 1) as shipping where 1 != 1 group by supp_nation, weight_string(supp_nation)", "Query": "select count(*), supp_nation, weight_string(supp_nation) from (select n1.n_name as supp_nation from nation as n1 where n1.n_nationkey = :s_nationkey) as shipping group by supp_nation, weight_string(supp_nation)", - "Table": "nation", "Values": [ ":s_nationkey" ], @@ -735,7 +704,6 @@ "JoinVars": { "c_nationkey": 1 }, - "TableName": "customer_nation", "Inputs": [ { "OperatorType": "Route", @@ -746,7 +714,6 @@ }, "FieldQuery": "select count(*), shipping.c_nationkey from (select c_nationkey as c_nationkey from customer where 1 != 1) as shipping where 1 != 1 group by shipping.c_nationkey", "Query": "select count(*), shipping.c_nationkey from (select c_nationkey as c_nationkey from customer where c_custkey = :o_custkey) as shipping group by shipping.c_nationkey", - "Table": "customer", "Values": [ ":o_custkey" ], @@ -761,7 +728,6 @@ }, "FieldQuery": "select count(*), cust_nation, weight_string(cust_nation) from (select n2.n_name as cust_nation from nation as n2 where 1 != 1) as shipping where 1 != 1 group by cust_nation, weight_string(cust_nation)", "Query": "select count(*), cust_nation, weight_string(cust_nation) from (select n2.n_name as cust_nation from nation as n2 where (:n1_n_name = 'FRANCE' and n2.n_name = 'GERMANY' or :n1_n_name = 'GERMANY' and n2.n_name = 'FRANCE') and n2.n_nationkey = :c_nationkey) as shipping group by cust_nation, weight_string(cust_nation)", - "Table": "nation", "Values": [ ":c_nationkey" ], @@ -829,7 +795,6 @@ "JoinVars": { "l_orderkey": 2 }, - "TableName": "lineitem_part_supplier_nation_orders_customer_nation_region", "Inputs": [ { "OperatorType": "Aggregate", @@ -845,7 +810,6 @@ "l_suppkey": 2, "volume": 0 }, - "TableName": "lineitem_part_supplier_nation", "Inputs": [ { "OperatorType": "Join", @@ -854,7 +818,6 @@ "JoinVars": { "l_partkey": 3 }, - "TableName": "lineitem_part", "Inputs": [ { "OperatorType": "Route", @@ -865,8 +828,7 @@ }, "FieldQuery": "select all_nations.volume, all_nations.l_orderkey, all_nations.l_suppkey, all_nations.l_partkey, weight_string(all_nations.l_orderkey) from (select l_extendedprice * (1 - l_discount) as volume, l_orderkey as l_orderkey, l_suppkey as l_suppkey, l_partkey as l_partkey from lineitem where 1 != 1) as all_nations where 1 != 1", "OrderBy": "(1|4) ASC", - "Query": "select all_nations.volume, all_nations.l_orderkey, all_nations.l_suppkey, all_nations.l_partkey, weight_string(all_nations.l_orderkey) from (select l_extendedprice * (1 - l_discount) as volume, l_orderkey as l_orderkey, l_suppkey as l_suppkey, l_partkey as l_partkey from lineitem) as all_nations order by all_nations.l_orderkey asc", - "Table": "lineitem" + "Query": "select all_nations.volume, all_nations.l_orderkey, all_nations.l_suppkey, all_nations.l_partkey, weight_string(all_nations.l_orderkey) from (select l_extendedprice * (1 - l_discount) as volume, l_orderkey as l_orderkey, l_suppkey as l_suppkey, l_partkey as l_partkey from lineitem) as all_nations order by all_nations.l_orderkey asc" }, { "OperatorType": "Route", @@ -877,7 +839,6 @@ }, "FieldQuery": "select 1 from part where 1 != 1", "Query": "select 1 from part where p_type = 'ECONOMY ANODIZED STEEL' and p_partkey = :l_partkey", - "Table": "part", "Values": [ ":l_partkey" ], @@ -892,7 +853,6 @@ "JoinVars": { "s_nationkey": 0 }, - "TableName": "supplier_nation", "Inputs": [ { "OperatorType": "Route", @@ -903,7 +863,6 @@ }, "FieldQuery": "select all_nations.s_nationkey from (select s_nationkey as s_nationkey from supplier where 1 != 1) as all_nations where 1 != 1", "Query": "select all_nations.s_nationkey from (select s_nationkey as s_nationkey from supplier where s_suppkey = :l_suppkey) as all_nations", - "Table": "supplier", "Values": [ ":l_suppkey" ], @@ -918,7 +877,6 @@ }, "FieldQuery": "select all_nations.nation, case when nation = 'BRAZIL' then :volume else 0 end from (select n2.n_name as nation from nation as n2 where 1 != 1) as all_nations where 1 != 1", "Query": "select all_nations.nation, case when nation = 'BRAZIL' then :volume else 0 end from (select n2.n_name as nation from nation as n2 where n2.n_nationkey = :s_nationkey) as all_nations", - "Table": "nation", "Values": [ ":s_nationkey" ], @@ -945,7 +903,6 @@ "JoinVars": { "c_nationkey": 2 }, - "TableName": "orders_customer_nation_region", "Inputs": [ { "OperatorType": "Projection", @@ -963,7 +920,6 @@ "JoinVars": { "o_custkey": 2 }, - "TableName": "orders_customer", "Inputs": [ { "OperatorType": "Route", @@ -974,7 +930,6 @@ }, "FieldQuery": "select count(*), o_year, all_nations.o_custkey, weight_string(o_year) from (select extract(year from o_orderdate) as o_year, o_custkey as o_custkey from orders where 1 != 1) as all_nations where 1 != 1 group by o_year, all_nations.o_custkey, weight_string(o_year)", "Query": "select count(*), o_year, all_nations.o_custkey, weight_string(o_year) from (select extract(year from o_orderdate) as o_year, o_custkey as o_custkey from orders where o_orderdate between date'1995-01-01' and date('1996-12-31') and o_orderkey = :l_orderkey) as all_nations group by o_year, all_nations.o_custkey, weight_string(o_year)", - "Table": "orders", "Values": [ ":l_orderkey" ], @@ -989,7 +944,6 @@ }, "FieldQuery": "select count(*), all_nations.c_nationkey from (select c_nationkey as c_nationkey from customer where 1 != 1) as all_nations where 1 != 1 group by all_nations.c_nationkey", "Query": "select count(*), all_nations.c_nationkey from (select c_nationkey as c_nationkey from customer where c_custkey = :o_custkey) as all_nations group by all_nations.c_nationkey", - "Table": "customer", "Values": [ ":o_custkey" ], @@ -1012,7 +966,6 @@ "JoinVars": { "n1_n_regionkey": 1 }, - "TableName": "nation_region", "Inputs": [ { "OperatorType": "Route", @@ -1023,7 +976,6 @@ }, "FieldQuery": "select count(*), n1.n_regionkey from nation as n1 where 1 != 1 group by n1.n_regionkey", "Query": "select count(*), n1.n_regionkey from nation as n1 where n1.n_nationkey = :c_nationkey group by n1.n_regionkey", - "Table": "nation", "Values": [ ":c_nationkey" ], @@ -1038,7 +990,6 @@ }, "FieldQuery": "select count(*) from region where 1 != 1 group by .0", "Query": "select count(*) from region where r_name = 'AMERICA' and r_regionkey = :n1_n_regionkey group by .0", - "Table": "region", "Values": [ ":n1_n_regionkey" ], @@ -1109,7 +1060,6 @@ "JoinVars": { "l_suppkey": 2 }, - "TableName": "orders_lineitem_part_partsupp_supplier_nation", "Inputs": [ { "OperatorType": "Aggregate", @@ -1128,7 +1078,6 @@ "l_quantity": 3, "l_suppkey": 4 }, - "TableName": "orders_lineitem_part_partsupp", "Inputs": [ { "OperatorType": "Sort", @@ -1142,7 +1091,6 @@ "JoinVars": { "o_orderkey": 1 }, - "TableName": "orders_lineitem_part", "Inputs": [ { "OperatorType": "Route", @@ -1152,8 +1100,7 @@ "Sharded": true }, "FieldQuery": "select profit.o_year, profit.o_orderkey, weight_string(profit.o_year) from (select extract(year from o_orderdate) as o_year, o_orderkey as o_orderkey from orders where 1 != 1) as profit where 1 != 1", - "Query": "select profit.o_year, profit.o_orderkey, weight_string(profit.o_year) from (select extract(year from o_orderdate) as o_year, o_orderkey as o_orderkey from orders) as profit", - "Table": "orders" + "Query": "select profit.o_year, profit.o_orderkey, weight_string(profit.o_year) from (select extract(year from o_orderdate) as o_year, o_orderkey as o_orderkey from orders) as profit" }, { "OperatorType": "Join", @@ -1162,7 +1109,6 @@ "JoinVars": { "l_partkey": 4 }, - "TableName": "lineitem_part", "Inputs": [ { "OperatorType": "VindexLookup", @@ -1185,7 +1131,6 @@ }, "FieldQuery": "select l_orderkey, l_linenumber from lineitem_map where 1 != 1", "Query": "select l_orderkey, l_linenumber from lineitem_map where l_orderkey in ::__vals", - "Table": "lineitem_map", "Values": [ "::l_orderkey" ], @@ -1199,8 +1144,7 @@ "Sharded": true }, "FieldQuery": "select profit.l_extendedprice, profit.l_discount, profit.l_quantity, profit.l_suppkey, profit.l_partkey, weight_string(profit.l_suppkey) from (select l_extendedprice, l_discount, l_quantity, l_suppkey as l_suppkey, l_partkey as l_partkey from lineitem where 1 != 1) as profit where 1 != 1", - "Query": "select profit.l_extendedprice, profit.l_discount, profit.l_quantity, profit.l_suppkey, profit.l_partkey, weight_string(profit.l_suppkey) from (select l_extendedprice, l_discount, l_quantity, l_suppkey as l_suppkey, l_partkey as l_partkey from lineitem where l_orderkey = :o_orderkey) as profit", - "Table": "lineitem" + "Query": "select profit.l_extendedprice, profit.l_discount, profit.l_quantity, profit.l_suppkey, profit.l_partkey, weight_string(profit.l_suppkey) from (select l_extendedprice, l_discount, l_quantity, l_suppkey as l_suppkey, l_partkey as l_partkey from lineitem where l_orderkey = :o_orderkey) as profit" } ] }, @@ -1213,7 +1157,6 @@ }, "FieldQuery": "select 1 from part where 1 != 1", "Query": "select 1 from part where p_name like '%green%' and p_partkey = :l_partkey", - "Table": "part", "Values": [ ":l_partkey" ], @@ -1246,7 +1189,6 @@ }, "FieldQuery": "select ps_partkey, ps_suppkey from partsupp_map where 1 != 1", "Query": "select ps_partkey, ps_suppkey from partsupp_map where ps_partkey in ::__vals", - "Table": "partsupp_map", "Values": [ "::ps_partkey" ], @@ -1260,8 +1202,7 @@ "Sharded": true }, "FieldQuery": "select profit.amount from (select :l_extendedprice * (1 - :l_discount) - ps_supplycost * :l_quantity as amount from partsupp where 1 != 1) as profit where 1 != 1", - "Query": "select profit.amount from (select :l_extendedprice * (1 - :l_discount) - ps_supplycost * :l_quantity as amount from partsupp where ps_partkey = :l_partkey and ps_suppkey = :l_suppkey) as profit", - "Table": "partsupp" + "Query": "select profit.amount from (select :l_extendedprice * (1 - :l_discount) - ps_supplycost * :l_quantity as amount from partsupp where ps_partkey = :l_partkey and ps_suppkey = :l_suppkey) as profit" } ] } @@ -1284,7 +1225,6 @@ "JoinVars": { "s_nationkey": 1 }, - "TableName": "supplier_nation", "Inputs": [ { "OperatorType": "Route", @@ -1295,7 +1235,6 @@ }, "FieldQuery": "select count(*), profit.s_nationkey from (select s_nationkey as s_nationkey from supplier where 1 != 1) as profit where 1 != 1 group by profit.s_nationkey", "Query": "select count(*), profit.s_nationkey from (select s_nationkey as s_nationkey from supplier where s_suppkey = :l_suppkey) as profit group by profit.s_nationkey", - "Table": "supplier", "Values": [ ":l_suppkey" ], @@ -1310,7 +1249,6 @@ }, "FieldQuery": "select count(*), nation, weight_string(nation) from (select n_name as nation from nation where 1 != 1) as profit where 1 != 1 group by nation, weight_string(nation)", "Query": "select count(*), nation, weight_string(nation) from (select n_name as nation from nation where n_nationkey = :s_nationkey) as profit group by nation, weight_string(nation)", - "Table": "nation", "Values": [ ":s_nationkey" ], @@ -1393,7 +1331,6 @@ "JoinVars": { "o_custkey": 1 }, - "TableName": "orders_lineitem_customer_nation", "Inputs": [ { "OperatorType": "Projection", @@ -1409,7 +1346,6 @@ "JoinVars": { "o_orderkey": 2 }, - "TableName": "orders_lineitem", "Inputs": [ { "OperatorType": "Route", @@ -1419,8 +1355,7 @@ "Sharded": true }, "FieldQuery": "select count(*), o_custkey, o_orderkey from orders where 1 != 1 group by o_custkey, o_orderkey", - "Query": "select count(*), o_custkey, o_orderkey from orders where o_orderdate >= date('1993-10-01') and o_orderdate < date('1993-10-01') + interval '3' month group by o_custkey, o_orderkey", - "Table": "orders" + "Query": "select count(*), o_custkey, o_orderkey from orders where o_orderdate >= date('1993-10-01') and o_orderdate < date('1993-10-01') + interval '3' month group by o_custkey, o_orderkey" }, { "OperatorType": "VindexLookup", @@ -1443,7 +1378,6 @@ }, "FieldQuery": "select l_orderkey, l_linenumber from lineitem_map where 1 != 1", "Query": "select l_orderkey, l_linenumber from lineitem_map where l_orderkey in ::__vals", - "Table": "lineitem_map", "Values": [ "::l_orderkey" ], @@ -1457,8 +1391,7 @@ "Sharded": true }, "FieldQuery": "select sum(l_extendedprice * (1 - l_discount)) as revenue from lineitem where 1 != 1 group by .0", - "Query": "select sum(l_extendedprice * (1 - l_discount)) as revenue from lineitem where l_returnflag = 'R' and l_orderkey = :o_orderkey group by .0", - "Table": "lineitem" + "Query": "select sum(l_extendedprice * (1 - l_discount)) as revenue from lineitem where l_returnflag = 'R' and l_orderkey = :o_orderkey group by .0" } ] } @@ -1493,7 +1426,6 @@ "JoinVars": { "c_nationkey": 7 }, - "TableName": "customer_nation", "Inputs": [ { "OperatorType": "Route", @@ -1504,7 +1436,6 @@ }, "FieldQuery": "select count(*), c_custkey, c_name, c_acctbal, c_phone, c_address, c_comment, c_nationkey, weight_string(c_custkey), weight_string(c_name), weight_string(c_acctbal), weight_string(c_phone), weight_string(c_address), weight_string(c_comment) from customer where 1 != 1 group by c_custkey, c_name, c_acctbal, c_phone, c_address, c_comment, c_nationkey, weight_string(c_custkey), weight_string(c_name), weight_string(c_acctbal), weight_string(c_phone), weight_string(c_address), weight_string(c_comment)", "Query": "select count(*), c_custkey, c_name, c_acctbal, c_phone, c_address, c_comment, c_nationkey, weight_string(c_custkey), weight_string(c_name), weight_string(c_acctbal), weight_string(c_phone), weight_string(c_address), weight_string(c_comment) from customer where c_custkey = :o_custkey group by c_custkey, c_name, c_acctbal, c_phone, c_address, c_comment, c_nationkey, weight_string(c_custkey), weight_string(c_name), weight_string(c_acctbal), weight_string(c_phone), weight_string(c_address), weight_string(c_comment)", - "Table": "customer", "Values": [ ":o_custkey" ], @@ -1519,7 +1450,6 @@ }, "FieldQuery": "select count(*), n_name, weight_string(n_name) from nation where 1 != 1 group by n_name, weight_string(n_name)", "Query": "select count(*), n_name, weight_string(n_name) from nation where n_nationkey = :c_nationkey group by n_name, weight_string(n_name)", - "Table": "nation", "Values": [ ":c_nationkey" ], @@ -1589,7 +1519,6 @@ "JoinVars": { "s_nationkey1": 2 }, - "TableName": "partsupp_supplier_nation", "Inputs": [ { "OperatorType": "Projection", @@ -1606,7 +1535,6 @@ "JoinVars": { "ps_suppkey1": 2 }, - "TableName": "partsupp_supplier", "Inputs": [ { "OperatorType": "Route", @@ -1616,8 +1544,7 @@ "Sharded": true }, "FieldQuery": "select sum(ps_supplycost * ps_availqty), 0.00001000000, ps_suppkey from partsupp where 1 != 1 group by ps_suppkey", - "Query": "select sum(ps_supplycost * ps_availqty), 0.00001000000, ps_suppkey from partsupp group by ps_suppkey", - "Table": "partsupp" + "Query": "select sum(ps_supplycost * ps_availqty), 0.00001000000, ps_suppkey from partsupp group by ps_suppkey" }, { "OperatorType": "Route", @@ -1628,7 +1555,6 @@ }, "FieldQuery": "select count(*), s_nationkey from supplier where 1 != 1 group by s_nationkey", "Query": "select count(*), s_nationkey from supplier where s_suppkey = :ps_suppkey1 group by s_nationkey", - "Table": "supplier", "Values": [ ":ps_suppkey1" ], @@ -1647,7 +1573,6 @@ }, "FieldQuery": "select count(*) from nation where 1 != 1 group by .0", "Query": "select count(*) from nation where n_name = 'GERMANY' and n_nationkey = :s_nationkey1 group by .0", - "Table": "nation", "Values": [ ":s_nationkey1" ], @@ -1693,7 +1618,6 @@ "JoinVars": { "s_nationkey": 2 }, - "TableName": "partsupp_supplier_nation", "Inputs": [ { "OperatorType": "Projection", @@ -1711,7 +1635,6 @@ "JoinVars": { "ps_suppkey": 2 }, - "TableName": "partsupp_supplier", "Inputs": [ { "OperatorType": "Route", @@ -1722,8 +1645,7 @@ }, "FieldQuery": "select sum(ps_supplycost * ps_availqty) as `value`, ps_partkey, ps_suppkey, weight_string(ps_partkey) from partsupp where 1 != 1 group by ps_partkey, ps_suppkey, weight_string(ps_partkey)", "OrderBy": "(1|3) ASC", - "Query": "select sum(ps_supplycost * ps_availqty) as `value`, ps_partkey, ps_suppkey, weight_string(ps_partkey) from partsupp group by ps_partkey, ps_suppkey, weight_string(ps_partkey) order by ps_partkey asc", - "Table": "partsupp" + "Query": "select sum(ps_supplycost * ps_availqty) as `value`, ps_partkey, ps_suppkey, weight_string(ps_partkey) from partsupp group by ps_partkey, ps_suppkey, weight_string(ps_partkey) order by ps_partkey asc" }, { "OperatorType": "Route", @@ -1734,7 +1656,6 @@ }, "FieldQuery": "select count(*), s_nationkey from supplier where 1 != 1 group by s_nationkey", "Query": "select count(*), s_nationkey from supplier where s_suppkey = :ps_suppkey group by s_nationkey", - "Table": "supplier", "Values": [ ":ps_suppkey" ], @@ -1753,7 +1674,6 @@ }, "FieldQuery": "select count(*) from nation where 1 != 1 group by .0", "Query": "select count(*) from nation where n_name = 'GERMANY' and n_nationkey = :s_nationkey group by .0", - "Table": "nation", "Values": [ ":s_nationkey" ], @@ -1813,7 +1733,6 @@ "JoinVars": { "o_orderkey": 2 }, - "TableName": "orders_lineitem", "Inputs": [ { "OperatorType": "Route", @@ -1823,8 +1742,7 @@ "Sharded": true }, "FieldQuery": "select sum(case when o_orderpriority = '1-URGENT' or o_orderpriority = '2-HIGH' then 1 else 0 end) as high_line_count, sum(case when o_orderpriority != '1-URGENT' and o_orderpriority != '2-HIGH' then 1 else 0 end) as low_line_count, o_orderkey from orders where 1 != 1 group by o_orderkey", - "Query": "select sum(case when o_orderpriority = '1-URGENT' or o_orderpriority = '2-HIGH' then 1 else 0 end) as high_line_count, sum(case when o_orderpriority != '1-URGENT' and o_orderpriority != '2-HIGH' then 1 else 0 end) as low_line_count, o_orderkey from orders group by o_orderkey", - "Table": "orders" + "Query": "select sum(case when o_orderpriority = '1-URGENT' or o_orderpriority = '2-HIGH' then 1 else 0 end) as high_line_count, sum(case when o_orderpriority != '1-URGENT' and o_orderpriority != '2-HIGH' then 1 else 0 end) as low_line_count, o_orderkey from orders group by o_orderkey" }, { "OperatorType": "VindexLookup", @@ -1847,7 +1765,6 @@ }, "FieldQuery": "select l_orderkey, l_linenumber from lineitem_map where 1 != 1", "Query": "select l_orderkey, l_linenumber from lineitem_map where l_orderkey in ::__vals", - "Table": "lineitem_map", "Values": [ "::l_orderkey" ], @@ -1861,8 +1778,7 @@ "Sharded": true }, "FieldQuery": "select count(*), l_shipmode, weight_string(l_shipmode) from lineitem where 1 != 1 group by l_shipmode, weight_string(l_shipmode)", - "Query": "select count(*), l_shipmode, weight_string(l_shipmode) from lineitem where l_shipmode in ('MAIL', 'SHIP') and l_commitdate < l_receiptdate and l_shipdate < l_commitdate and l_receiptdate >= date('1994-01-01') and l_receiptdate < date('1994-01-01') + interval '1' year and l_orderkey = :o_orderkey group by l_shipmode, weight_string(l_shipmode)", - "Table": "lineitem" + "Query": "select count(*), l_shipmode, weight_string(l_shipmode) from lineitem where l_shipmode in ('MAIL', 'SHIP') and l_commitdate < l_receiptdate and l_shipdate < l_commitdate and l_receiptdate >= date('1994-01-01') and l_receiptdate < date('1994-01-01') + interval '1' year and l_orderkey = :o_orderkey group by l_shipmode, weight_string(l_shipmode)" } ] } @@ -1931,7 +1847,6 @@ "JoinVars": { "c_custkey": 1 }, - "TableName": "customer_orders", "Inputs": [ { "OperatorType": "Route", @@ -1942,8 +1857,7 @@ }, "FieldQuery": "select count(*), c_custkey, weight_string(c_custkey) from customer where 1 != 1 group by c_custkey, weight_string(c_custkey)", "OrderBy": "(1|2) ASC", - "Query": "select count(*), c_custkey, weight_string(c_custkey) from customer group by c_custkey, weight_string(c_custkey) order by c_custkey asc", - "Table": "customer" + "Query": "select count(*), c_custkey, weight_string(c_custkey) from customer group by c_custkey, weight_string(c_custkey) order by c_custkey asc" }, { "OperatorType": "Route", @@ -1953,8 +1867,7 @@ "Sharded": true }, "FieldQuery": "select count(o_orderkey) from orders where 1 != 1 group by .0", - "Query": "select count(o_orderkey) from orders where o_comment not like '%special%requests%' and o_custkey = :c_custkey group by .0", - "Table": "orders" + "Query": "select count(o_orderkey) from orders where o_comment not like '%special%requests%' and o_custkey = :c_custkey group by .0" } ] } @@ -2011,7 +1924,6 @@ "l_extendedprice": 0, "l_partkey": 3 }, - "TableName": "lineitem_part", "Inputs": [ { "OperatorType": "Route", @@ -2021,8 +1933,7 @@ "Sharded": true }, "FieldQuery": "select l_extendedprice, l_discount, l_extendedprice * (1 - l_discount), l_partkey from lineitem where 1 != 1", - "Query": "select l_extendedprice, l_discount, l_extendedprice * (1 - l_discount), l_partkey from lineitem where l_shipdate >= date('1995-09-01') and l_shipdate < date('1995-09-01') + interval '1' month", - "Table": "lineitem" + "Query": "select l_extendedprice, l_discount, l_extendedprice * (1 - l_discount), l_partkey from lineitem where l_shipdate >= date('1995-09-01') and l_shipdate < date('1995-09-01') + interval '1' month" }, { "OperatorType": "Route", @@ -2033,7 +1944,6 @@ }, "FieldQuery": "select case when p_type like 'PROMO%' then :l_extendedprice * (1 - :l_discount) else 0 end from part where 1 != 1", "Query": "select case when p_type like 'PROMO%' then :l_extendedprice * (1 - :l_discount) else 0 end from part where p_partkey = :l_partkey", - "Table": "part", "Values": [ ":l_partkey" ], @@ -2081,8 +1991,7 @@ "Sharded": true }, "FieldQuery": "select max(total_revenue), weight_string(max(total_revenue)) from revenue0 where 1 != 1", - "Query": "select max(total_revenue), weight_string(max(total_revenue)) from revenue0", - "Table": "revenue0" + "Query": "select max(total_revenue), weight_string(max(total_revenue)) from revenue0" } ] }, @@ -2097,8 +2006,7 @@ "FieldQuery": "select s_suppkey, s_name, s_address, s_phone, total_revenue, weight_string(s_suppkey) from supplier, revenue0 where 1 != 1", "OrderBy": "(0|5) ASC", "Query": "select s_suppkey, s_name, s_address, s_phone, total_revenue, weight_string(s_suppkey) from supplier, revenue0 where s_suppkey = supplier_no and total_revenue = :__sq1 order by supplier.s_suppkey asc", - "ResultColumns": 5, - "Table": "revenue0, supplier" + "ResultColumns": 5 } ] }, @@ -2140,7 +2048,6 @@ "ps_partkey": 1, "ps_suppkey": 0 }, - "TableName": "partsupp_part", "Inputs": [ { "OperatorType": "UncorrelatedSubquery", @@ -2159,8 +2066,7 @@ "Sharded": true }, "FieldQuery": "select s_suppkey from supplier where 1 != 1", - "Query": "select s_suppkey from supplier where s_comment like '%Customer%Complaints%'", - "Table": "supplier" + "Query": "select s_suppkey from supplier where s_comment like '%Customer%Complaints%'" }, { "InputName": "Outer", @@ -2171,8 +2077,7 @@ "Sharded": true }, "FieldQuery": "select ps_suppkey, ps_partkey, weight_string(ps_suppkey) from partsupp where 1 != 1", - "Query": "select ps_suppkey, ps_partkey, weight_string(ps_suppkey) from partsupp where not :__sq_has_values or ps_suppkey not in ::__sq1", - "Table": "partsupp" + "Query": "select ps_suppkey, ps_partkey, weight_string(ps_suppkey) from partsupp where not :__sq_has_values or ps_suppkey not in ::__sq1" } ] }, @@ -2185,7 +2090,6 @@ }, "FieldQuery": "select p_brand, p_type, p_size, weight_string(p_brand), weight_string(p_type), weight_string(p_size) from part where 1 != 1", "Query": "select p_brand, p_type, p_size, weight_string(p_brand), weight_string(p_type), weight_string(p_size) from part where p_brand != 'Brand#45' and p_type not like 'MEDIUM POLISHED%' and p_size in (49, 14, 23, 45, 19, 3, 36, 9) and p_partkey = :ps_partkey", - "Table": "part", "Values": [ ":ps_partkey" ], @@ -2246,8 +2150,7 @@ "Sharded": true }, "FieldQuery": "select l_orderkey from lineitem where 1 != 1 group by l_orderkey", - "Query": "select l_orderkey from lineitem group by l_orderkey having sum(l_quantity) > 300", - "Table": "lineitem" + "Query": "select l_orderkey from lineitem group by l_orderkey having sum(l_quantity) > 300" }, { "InputName": "Outer", @@ -2282,7 +2185,6 @@ "JoinVars": { "l_orderkey": 1 }, - "TableName": "lineitem_orders_customer", "Inputs": [ { "OperatorType": "Route", @@ -2292,8 +2194,7 @@ "Sharded": true }, "FieldQuery": "select sum(l_quantity), l_orderkey from lineitem where 1 != 1 group by l_orderkey", - "Query": "select sum(l_quantity), l_orderkey from lineitem group by l_orderkey", - "Table": "lineitem" + "Query": "select sum(l_quantity), l_orderkey from lineitem group by l_orderkey" }, { "OperatorType": "Projection", @@ -2318,7 +2219,6 @@ "JoinVars": { "o_custkey": 4 }, - "TableName": "orders_customer", "Inputs": [ { "OperatorType": "Route", @@ -2329,7 +2229,6 @@ }, "FieldQuery": "select count(*), o_orderkey, o_orderdate, o_totalprice, o_custkey, weight_string(o_totalprice), weight_string(o_orderdate), weight_string(o_orderkey) from orders where 1 != 1 group by o_orderkey, o_orderdate, o_totalprice, o_custkey, weight_string(o_totalprice), weight_string(o_orderdate), weight_string(o_orderkey)", "Query": "select count(*), o_orderkey, o_orderdate, o_totalprice, o_custkey, weight_string(o_totalprice), weight_string(o_orderdate), weight_string(o_orderkey) from orders where o_orderkey = :l_orderkey group by o_orderkey, o_orderdate, o_totalprice, o_custkey, weight_string(o_totalprice), weight_string(o_orderdate), weight_string(o_orderkey)", - "Table": "orders", "Values": [ ":l_orderkey" ], @@ -2344,7 +2243,6 @@ }, "FieldQuery": "select count(*), c_name, c_custkey, weight_string(c_name), weight_string(c_custkey) from customer where 1 != 1 group by c_name, c_custkey, weight_string(c_name), weight_string(c_custkey)", "Query": "select count(*), c_name, c_custkey, weight_string(c_name), weight_string(c_custkey) from customer where c_custkey = :o_custkey group by c_name, c_custkey, weight_string(c_name), weight_string(c_custkey)", - "Table": "customer", "Values": [ ":o_custkey" ], @@ -2403,7 +2301,6 @@ "l_shipinstruct": 4, "l_shipmode": 3 }, - "TableName": "lineitem_part", "Inputs": [ { "OperatorType": "Route", @@ -2413,8 +2310,7 @@ "Sharded": true }, "FieldQuery": "select sum(l_extendedprice * (1 - l_discount)) as revenue, l_partkey, l_quantity, l_shipmode, l_shipinstruct from lineitem where 1 != 1 group by l_partkey, l_quantity, l_shipmode, l_shipinstruct", - "Query": "select sum(l_extendedprice * (1 - l_discount)) as revenue, l_partkey, l_quantity, l_shipmode, l_shipinstruct from lineitem group by l_partkey, l_quantity, l_shipmode, l_shipinstruct", - "Table": "lineitem" + "Query": "select sum(l_extendedprice * (1 - l_discount)) as revenue, l_partkey, l_quantity, l_shipmode, l_shipinstruct from lineitem group by l_partkey, l_quantity, l_shipmode, l_shipinstruct" }, { "OperatorType": "Route", @@ -2424,8 +2320,7 @@ "Sharded": true }, "FieldQuery": "select count(*) from part where 1 != 1 group by .0", - "Query": "select count(*) from part where p_partkey = :l_partkey and p_brand = 'Brand#12' and p_container in ('SM CASE', 'SM BOX', 'SM PACK', 'SM PKG') and :l_quantity >= 1 and :l_quantity <= 1 + 10 and p_size between 1 and 5 and :l_shipmode in ('AIR', 'AIR REG') and :l_shipinstruct = 'DELIVER IN PERSON' or p_partkey = :l_partkey and p_brand = 'Brand#23' and p_container in ('MED BAG', 'MED BOX', 'MED PKG', 'MED PACK') and :l_quantity >= 10 and :l_quantity <= 10 + 10 and p_size between 1 and 10 and :l_shipmode in ('AIR', 'AIR REG') and :l_shipinstruct = 'DELIVER IN PERSON' or p_partkey = :l_partkey and p_brand = 'Brand#34' and p_container in ('LG CASE', 'LG BOX', 'LG PACK', 'LG PKG') and :l_quantity >= 20 and :l_quantity <= 20 + 10 and p_size between 1 and 15 and :l_shipmode in ('AIR', 'AIR REG') and :l_shipinstruct = 'DELIVER IN PERSON' group by .0", - "Table": "part" + "Query": "select count(*) from part where p_partkey = :l_partkey and p_brand = 'Brand#12' and p_container in ('SM CASE', 'SM BOX', 'SM PACK', 'SM PKG') and :l_quantity >= 1 and :l_quantity <= 1 + 10 and p_size between 1 and 5 and :l_shipmode in ('AIR', 'AIR REG') and :l_shipinstruct = 'DELIVER IN PERSON' or p_partkey = :l_partkey and p_brand = 'Brand#23' and p_container in ('MED BAG', 'MED BOX', 'MED PKG', 'MED PACK') and :l_quantity >= 10 and :l_quantity <= 10 + 10 and p_size between 1 and 10 and :l_shipmode in ('AIR', 'AIR REG') and :l_shipinstruct = 'DELIVER IN PERSON' or p_partkey = :l_partkey and p_brand = 'Brand#34' and p_container in ('LG CASE', 'LG BOX', 'LG PACK', 'LG PKG') and :l_quantity >= 20 and :l_quantity <= 20 + 10 and p_size between 1 and 15 and :l_shipmode in ('AIR', 'AIR REG') and :l_shipinstruct = 'DELIVER IN PERSON' group by .0" } ] } @@ -2487,7 +2382,6 @@ "JoinVars": { "l1_l_suppkey": 1 }, - "TableName": "lineitem_orders_supplier_nation", "Inputs": [ { "OperatorType": "Projection", @@ -2504,7 +2398,6 @@ "l1_l_orderkey": 2, "l1_l_suppkey": 1 }, - "TableName": "lineitem_orders", "Inputs": [ { "OperatorType": "Route", @@ -2514,8 +2407,7 @@ "Sharded": true }, "FieldQuery": "select count(*), l1.l_suppkey, l1.l_orderkey from lineitem as l1 where 1 != 1 group by l1.l_suppkey, l1.l_orderkey", - "Query": "select count(*), l1.l_suppkey, l1.l_orderkey from lineitem as l1 where l1.l_receiptdate > l1.l_commitdate and exists (select 1 from lineitem as l2 where l2.l_orderkey = l1.l_orderkey and l2.l_suppkey != l1.l_suppkey) and not exists (select 1 from lineitem as l3 where l3.l_orderkey = l1.l_orderkey and l3.l_suppkey != l1.l_suppkey and l3.l_receiptdate > l3.l_commitdate) group by l1.l_suppkey, l1.l_orderkey", - "Table": "lineitem" + "Query": "select count(*), l1.l_suppkey, l1.l_orderkey from lineitem as l1 where l1.l_receiptdate > l1.l_commitdate and exists (select 1 from lineitem as l2 where l2.l_orderkey = l1.l_orderkey and l2.l_suppkey != l1.l_suppkey) and not exists (select 1 from lineitem as l3 where l3.l_orderkey = l1.l_orderkey and l3.l_suppkey != l1.l_suppkey and l3.l_receiptdate > l3.l_commitdate) group by l1.l_suppkey, l1.l_orderkey" }, { "OperatorType": "Route", @@ -2526,7 +2418,6 @@ }, "FieldQuery": "select count(*) from orders where 1 != 1 group by .0", "Query": "select count(*) from orders where o_orderstatus = 'F' and o_orderkey = :l1_l_orderkey group by .0", - "Table": "orders", "Values": [ ":l1_l_orderkey" ], @@ -2551,7 +2442,6 @@ "JoinVars": { "s_nationkey": 2 }, - "TableName": "supplier_nation", "Inputs": [ { "OperatorType": "Route", @@ -2562,7 +2452,6 @@ }, "FieldQuery": "select count(*), s_name, s_nationkey, weight_string(s_name) from supplier where 1 != 1 group by s_name, s_nationkey, weight_string(s_name)", "Query": "select count(*), s_name, s_nationkey, weight_string(s_name) from supplier where s_suppkey = :l1_l_suppkey group by s_name, s_nationkey, weight_string(s_name)", - "Table": "supplier", "Values": [ ":l1_l_suppkey" ], @@ -2577,7 +2466,6 @@ }, "FieldQuery": "select count(*) from nation where 1 != 1 group by .0", "Query": "select count(*) from nation where n_name = 'SAUDI ARABIA' and n_nationkey = :s_nationkey group by .0", - "Table": "nation", "Values": [ ":s_nationkey" ], diff --git a/go/vt/vtgate/planbuilder/testdata/union_cases.json b/go/vt/vtgate/planbuilder/testdata/union_cases.json index f03fae2061e..ddd802f7ab2 100644 --- a/go/vt/vtgate/planbuilder/testdata/union_cases.json +++ b/go/vt/vtgate/planbuilder/testdata/union_cases.json @@ -14,8 +14,7 @@ "Sharded": true }, "FieldQuery": "select id from `user` where 1 != 1 union all select id from music where 1 != 1", - "Query": "select id from `user` union all select id from music", - "Table": "`user`, music" + "Query": "select id from `user` union all select id from music" }, "TablesUsed": [ "user.music", @@ -45,8 +44,7 @@ "Sharded": true }, "FieldQuery": "select dt.c0 as id, weight_string(dt.c0) from (select id from `user` where 1 != 1 union select id from music where 1 != 1) as dt(c0) where 1 != 1", - "Query": "select dt.c0 as id, weight_string(dt.c0) from (select id from `user` union select id from music) as dt(c0)", - "Table": "`user`, music" + "Query": "select dt.c0 as id, weight_string(dt.c0) from (select id from `user` union select id from music) as dt(c0)" } ] }, @@ -84,7 +82,6 @@ }, "FieldQuery": "select 1 as col, case when 1 = 1 then 1 else 2 end from `user` where 1 != 1", "Query": "select 1 as col, case when 1 = 1 then 1 else 2 end from `user` where id = 14", - "Table": "`user`", "Values": [ "14" ], @@ -99,7 +96,6 @@ }, "FieldQuery": "select 2, case when 2 = 1 then 1 else 2 end from music where 1 != 1", "Query": "select 2, case when 2 = 1 then 1 else 2 end from music where user_id = 12", - "Table": "music", "Values": [ "12" ], @@ -136,7 +132,6 @@ }, "FieldQuery": "select id from `user` where 1 != 1", "Query": "select id from `user` where id = 1", - "Table": "`user`", "Values": [ "1" ], @@ -151,7 +146,6 @@ }, "FieldQuery": "select id from `user` where 1 != 1", "Query": "select id from `user` where id = 5", - "Table": "`user`", "Values": [ "5" ], @@ -194,8 +188,7 @@ }, "FieldQuery": "select id, weight_string(id) from `user` where 1 != 1", "OrderBy": "(0|1) DESC", - "Query": "select id, weight_string(id) from `user` order by `user`.id desc limit 1", - "Table": "`user`" + "Query": "select id, weight_string(id) from `user` order by `user`.id desc limit 1" } ] }, @@ -212,8 +205,7 @@ }, "FieldQuery": "select id, weight_string(id) from music where 1 != 1", "OrderBy": "(0|1) DESC", - "Query": "select id, weight_string(id) from music order by music.id desc limit 1", - "Table": "music" + "Query": "select id, weight_string(id) from music order by music.id desc limit 1" } ] } @@ -242,8 +234,7 @@ "Sharded": true }, "FieldQuery": "select col1, col2 from `user` where 1 != 1 union all select col1, col2 from user_extra where 1 != 1", - "Query": "select col1, col2 from `user` union all select col1, col2 from user_extra", - "Table": "`user`, user_extra" + "Query": "select col1, col2 from `user` union all select col1, col2 from user_extra" }, "TablesUsed": [ "user.user", @@ -266,8 +257,7 @@ "Sharded": true }, "FieldQuery": "select * from (select * from `user` where 1 != 1 union all select * from user_extra where 1 != 1) as t where 1 != 1", - "Query": "select * from (select * from `user` union all select * from user_extra) as t", - "Table": "`user`, user_extra" + "Query": "select * from (select * from `user` union all select * from user_extra) as t" }, "TablesUsed": [ "user.user", @@ -290,8 +280,7 @@ "Sharded": true }, "FieldQuery": "select col1, col2 from (select col1, col2 from `user` where 1 != 1 union all select col1, col2 from user_extra where 1 != 1) as t where 1 != 1", - "Query": "select col1, col2 from (select col1, col2 from `user` union all select col1, col2 from user_extra) as t", - "Table": "`user`, user_extra" + "Query": "select col1, col2 from (select col1, col2 from `user` union all select col1, col2 from user_extra) as t" }, "TablesUsed": [ "user.user", @@ -329,8 +318,7 @@ }, "FieldQuery": "select id, weight_string(id) from `user` where 1 != 1", "OrderBy": "(0|1) ASC", - "Query": "select id, weight_string(id) from `user` order by `user`.id asc limit 5", - "Table": "`user`" + "Query": "select id, weight_string(id) from `user` order by `user`.id asc limit 5" } ] }, @@ -347,8 +335,7 @@ }, "FieldQuery": "select id, weight_string(id) from music where 1 != 1", "OrderBy": "(0|1) DESC", - "Query": "select id, weight_string(id) from music order by music.id desc limit 5", - "Table": "music" + "Query": "select id, weight_string(id) from music order by music.id desc limit 5" } ] } @@ -377,8 +364,7 @@ "Sharded": true }, "FieldQuery": "select id from `user` where 1 != 1 union select id from `user` where 1 != 1 union all select id from `user` where 1 != 1", - "Query": "select id from `user` where id = 1 union select id from `user` where id = 1 union all select id from `user`", - "Table": "`user`" + "Query": "select id from `user` where id = 1 union select id from `user` where id = 1 union all select id from `user`" }, "TablesUsed": [ "user.user" @@ -410,8 +396,7 @@ "Sharded": false }, "FieldQuery": "select dt.c0 as CHARACTER_SET_NAME, weight_string(dt.c0) from (select CHARACTER_SET_NAME from information_schema.CHARACTER_SETS where 1 != 1) as dt(c0) where 1 != 1", - "Query": "select dt.c0 as CHARACTER_SET_NAME, weight_string(dt.c0) from (select distinct CHARACTER_SET_NAME from information_schema.CHARACTER_SETS) as dt(c0)", - "Table": "information_schema.CHARACTER_SETS" + "Query": "select dt.c0 as CHARACTER_SET_NAME, weight_string(dt.c0) from (select distinct CHARACTER_SET_NAME from information_schema.CHARACTER_SETS) as dt(c0)" }, { "OperatorType": "Route", @@ -421,8 +406,7 @@ "Sharded": false }, "FieldQuery": "select dt.c0 as user_name, weight_string(dt.c0) from (select user_name from unsharded where 1 != 1) as dt(c0) where 1 != 1", - "Query": "select dt.c0 as user_name, weight_string(dt.c0) from (select distinct user_name from unsharded) as dt(c0)", - "Table": "unsharded" + "Query": "select dt.c0 as user_name, weight_string(dt.c0) from (select distinct user_name from unsharded) as dt(c0)" } ] } @@ -459,8 +443,7 @@ "Sharded": true }, "FieldQuery": "select id from `user` where 1 != 1 union select id from music where 1 != 1 union select 1 from dual where 1 != 1", - "Query": "select id from `user` union select id from music union select 1 from dual", - "Table": "`user`, dual, music" + "Query": "select id from `user` union select id from music union select 1 from dual" } ] }, @@ -487,7 +470,6 @@ }, "FieldQuery": "select * from music where 1 != 1 union select * from `user` where 1 != 1", "Query": "select * from music where user_id = 1 union select * from `user` where id = 1", - "Table": "`user`, music", "Values": [ "1" ], @@ -541,7 +523,6 @@ }, "FieldQuery": "select `name`, keyspace_id from name_user_vdx where 1 != 1", "Query": "select `name`, keyspace_id from name_user_vdx where `name` in ::__vals", - "Table": "name_user_vdx", "Values": [ "::name" ], @@ -555,8 +536,7 @@ "Sharded": true }, "FieldQuery": "select 1 from music where 1 != 1", - "Query": "select distinct 1 from music where id = 1", - "Table": "music" + "Query": "select distinct 1 from music where id = 1" } ] }, @@ -581,7 +561,6 @@ }, "FieldQuery": "select `name`, keyspace_id from name_user_vdx where 1 != 1", "Query": "select `name`, keyspace_id from name_user_vdx where `name` in ::__vals", - "Table": "name_user_vdx", "Values": [ "::name" ], @@ -595,8 +574,7 @@ "Sharded": true }, "FieldQuery": "select 1 from music where 1 != 1", - "Query": "select distinct 1 from music where id = 2", - "Table": "music" + "Query": "select distinct 1 from music where id = 2" } ] } @@ -631,8 +609,7 @@ "Sharded": true }, "FieldQuery": "select dt.c0 as id, weight_string(dt.c0) from ((select id from `user` where 1 != 1) union (select id from `user` where 1 != 1)) as dt(c0) where 1 != 1", - "Query": "select dt.c0 as id, weight_string(dt.c0) from ((select id from `user` order by id desc) union (select id from `user` order by id asc)) as dt(c0)", - "Table": "`user`" + "Query": "select dt.c0 as id, weight_string(dt.c0) from ((select id from `user` order by id desc) union (select id from `user` order by id asc)) as dt(c0)" } ] }, @@ -662,8 +639,7 @@ "Sharded": true }, "FieldQuery": "select 1 from dual where 1 != 1 union select null from dual where 1 != 1 union select 1.0 from dual where 1 != 1 union select '1' from dual where 1 != 1 union select 2 from dual where 1 != 1 union select 2.0 from `user` where 1 != 1", - "Query": "select 1 from dual union select null from dual union select 1.0 from dual union select '1' from dual union select 2 from dual union select 2.0 from `user`", - "Table": "`user`, dual" + "Query": "select 1 from dual union select null from dual union select 1.0 from dual union select '1' from dual union select 2 from dual union select 2.0 from `user`" } ] }, @@ -695,7 +671,6 @@ "OperatorType": "Join", "Variant": "Join", "JoinColumnIndexes": "L:0,L:1,L:2,L:3", - "TableName": "`user`_user_extra", "Inputs": [ { "OperatorType": "Route", @@ -705,8 +680,7 @@ "Sharded": true }, "FieldQuery": "select `user`.id, `user`.`name`, weight_string(`user`.id), weight_string(`user`.`name`) from `user` where 1 != 1", - "Query": "select distinct `user`.id, `user`.`name`, weight_string(`user`.id), weight_string(`user`.`name`) from `user`", - "Table": "`user`" + "Query": "select distinct `user`.id, `user`.`name`, weight_string(`user`.id), weight_string(`user`.`name`) from `user`" }, { "OperatorType": "Route", @@ -716,8 +690,7 @@ "Sharded": true }, "FieldQuery": "select 1 from user_extra where 1 != 1", - "Query": "select distinct 1 from user_extra where user_extra.extra = 'asdf'", - "Table": "user_extra" + "Query": "select distinct 1 from user_extra where user_extra.extra = 'asdf'" } ] }, @@ -729,8 +702,7 @@ "Sharded": true }, "FieldQuery": "select dt.c0 as b, dt.c1 as c, weight_string(dt.c0), weight_string(dt.c1) from (select 'b', 'c' from `user` where 1 != 1) as dt(c0, c1) where 1 != 1", - "Query": "select dt.c0 as b, dt.c1 as c, weight_string(dt.c0), weight_string(dt.c1) from (select distinct 'b', 'c' from `user`) as dt(c0, c1)", - "Table": "`user`" + "Query": "select dt.c0 as b, dt.c1 as c, weight_string(dt.c0), weight_string(dt.c1) from (select distinct 'b', 'c' from `user`) as dt(c0, c1)" } ] } @@ -768,14 +740,12 @@ "Sharded": true }, "FieldQuery": "select dt.c0 as b, dt.c1 as c, weight_string(dt.c0), weight_string(dt.c1) from (select 'b', 'c' from `user` where 1 != 1) as dt(c0, c1) where 1 != 1", - "Query": "select dt.c0 as b, dt.c1 as c, weight_string(dt.c0), weight_string(dt.c1) from (select distinct 'b', 'c' from `user`) as dt(c0, c1)", - "Table": "`user`" + "Query": "select dt.c0 as b, dt.c1 as c, weight_string(dt.c0), weight_string(dt.c1) from (select distinct 'b', 'c' from `user`) as dt(c0, c1)" }, { "OperatorType": "Join", "Variant": "Join", "JoinColumnIndexes": "L:0,L:1,L:2,L:3", - "TableName": "`user`_user_extra", "Inputs": [ { "OperatorType": "Route", @@ -785,8 +755,7 @@ "Sharded": true }, "FieldQuery": "select `user`.id, `user`.`name`, weight_string(`user`.id), weight_string(`user`.`name`) from `user` where 1 != 1", - "Query": "select distinct `user`.id, `user`.`name`, weight_string(`user`.id), weight_string(`user`.`name`) from `user`", - "Table": "`user`" + "Query": "select distinct `user`.id, `user`.`name`, weight_string(`user`.id), weight_string(`user`.`name`) from `user`" }, { "OperatorType": "Route", @@ -796,8 +765,7 @@ "Sharded": true }, "FieldQuery": "select 1 from user_extra where 1 != 1", - "Query": "select distinct 1 from user_extra where user_extra.extra = 'asdf'", - "Table": "user_extra" + "Query": "select distinct 1 from user_extra where user_extra.extra = 'asdf'" } ] } @@ -840,8 +808,7 @@ "Sharded": true }, "FieldQuery": "select count(*) as s from `user` where 1 != 1", - "Query": "select count(*) as s from `user`", - "Table": "`user`" + "Query": "select count(*) as s from `user`" } ] }, @@ -858,8 +825,7 @@ "Sharded": true }, "FieldQuery": "select count(*) as s from music where 1 != 1", - "Query": "select count(*) as s from music", - "Table": "music" + "Query": "select count(*) as s from music" } ] } @@ -895,8 +861,7 @@ "Sharded": true }, "FieldQuery": "select dt.c0 as id, weight_string(dt.c0) from (select id from `user` where 1 != 1 union select id + 1 from `user` where 1 != 1 union select user_id from user_extra where 1 != 1) as dt(c0) where 1 != 1", - "Query": "select dt.c0 as id, weight_string(dt.c0) from (select id from `user` union select id + 1 from `user` union select user_id from user_extra) as dt(c0)", - "Table": "`user`, user_extra" + "Query": "select dt.c0 as id, weight_string(dt.c0) from (select id from `user` union select id + 1 from `user` union select user_id from user_extra) as dt(c0)" } ] }, @@ -931,8 +896,7 @@ "Sharded": true }, "FieldQuery": "select dt.c0 as id, weight_string(dt.c0) from (select id from `user` where 1 != 1 union select id from music where 1 != 1) as dt(c0) where 1 != 1", - "Query": "select dt.c0 as id, weight_string(dt.c0) from (select id from `user` union select id from music) as dt(c0)", - "Table": "`user`, music" + "Query": "select dt.c0 as id, weight_string(dt.c0) from (select id from `user` union select id from music) as dt(c0)" }, { "OperatorType": "Route", @@ -942,8 +906,7 @@ "Sharded": false }, "FieldQuery": "select dt.c0 as `1`, weight_string(dt.c0) from (select 1 from unsharded where 1 != 1) as dt(c0) where 1 != 1", - "Query": "select dt.c0 as `1`, weight_string(dt.c0) from (select distinct 1 from unsharded) as dt(c0)", - "Table": "unsharded" + "Query": "select dt.c0 as `1`, weight_string(dt.c0) from (select distinct 1 from unsharded) as dt(c0)" } ] } @@ -981,8 +944,7 @@ "Sharded": true }, "FieldQuery": "select id from `user` where 1 != 1 union select 3 from dual where 1 != 1", - "Query": "select id from `user` union select 3 from dual limit :__upper_limit", - "Table": "`user`, dual" + "Query": "select id from `user` union select 3 from dual limit :__upper_limit" } ] } @@ -1009,8 +971,7 @@ "Sharded": false }, "FieldQuery": "(select 1 from unsharded where 1 != 1 union select 1 from unsharded where 1 != 1 union all select 1 from unsharded where 1 != 1) union select 1 from unsharded where 1 != 1 union all select 1 from unsharded where 1 != 1", - "Query": "(select 1 from unsharded union select 1 from unsharded union all select 1 from unsharded order by 1 asc) union select 1 from unsharded union all select 1 from unsharded order by 1 asc", - "Table": "unsharded" + "Query": "(select 1 from unsharded union select 1 from unsharded union all select 1 from unsharded order by 1 asc) union select 1 from unsharded union all select 1 from unsharded order by 1 asc" }, "TablesUsed": [ "main.unsharded" @@ -1041,8 +1002,7 @@ "Sharded": false }, "FieldQuery": "select table_comment from information_schema.`tables` where 1 != 1", - "Query": "select distinct table_comment from information_schema.`tables`", - "Table": "information_schema.`tables`" + "Query": "select distinct table_comment from information_schema.`tables`" }, { "OperatorType": "Route", @@ -1052,8 +1012,7 @@ "Sharded": false }, "FieldQuery": "select table_comment from information_schema.`tables` where 1 != 1", - "Query": "select distinct table_comment from information_schema.`tables`", - "Table": "information_schema.`tables`" + "Query": "select distinct table_comment from information_schema.`tables`" } ] } @@ -1086,8 +1045,7 @@ "Sharded": false }, "FieldQuery": "select dt.c0 as col, weight_string(dt.c0) from (select col from unsharded where 1 != 1 union select col2 from unsharded where 1 != 1) as dt(c0) where 1 != 1", - "Query": "select dt.c0 as col, weight_string(dt.c0) from (select col from unsharded union select col2 from unsharded) as dt(c0)", - "Table": "unsharded" + "Query": "select dt.c0 as col, weight_string(dt.c0) from (select col from unsharded union select col2 from unsharded) as dt(c0)" }, { "OperatorType": "Route", @@ -1097,8 +1055,7 @@ "Sharded": true }, "FieldQuery": "select dt.c0 as id, weight_string(dt.c0) from (select id from `user` where 1 != 1 union select col from user_extra where 1 != 1) as dt(c0) where 1 != 1", - "Query": "select dt.c0 as id, weight_string(dt.c0) from (select id from `user` union select col from user_extra) as dt(c0)", - "Table": "`user`, user_extra" + "Query": "select dt.c0 as id, weight_string(dt.c0) from (select id from `user` union select col from user_extra) as dt(c0)" } ] } @@ -1125,7 +1082,6 @@ "JoinVars": { "tbl1_id": 0 }, - "TableName": "`user`_`user`", "Inputs": [ { "OperatorType": "Concatenate", @@ -1143,8 +1099,7 @@ }, "FieldQuery": "select id, weight_string(id) from `user` where 1 != 1", "OrderBy": "(0|1) ASC", - "Query": "select id, weight_string(id) from `user` order by `user`.id asc limit 5", - "Table": "`user`" + "Query": "select id, weight_string(id) from `user` order by `user`.id asc limit 5" } ] }, @@ -1161,8 +1116,7 @@ }, "FieldQuery": "select id, weight_string(id) from `user` where 1 != 1", "OrderBy": "(0|1) DESC", - "Query": "select id, weight_string(id) from `user` order by `user`.id desc limit 5", - "Table": "`user`" + "Query": "select id, weight_string(id) from `user` order by `user`.id desc limit 5" } ] } @@ -1177,7 +1131,6 @@ }, "FieldQuery": "select tbl2.id from `user` as tbl2 where 1 != 1", "Query": "select tbl2.id from `user` as tbl2 where tbl2.id = :tbl1_id", - "Table": "`user`", "Values": [ ":tbl1_id" ], @@ -1238,8 +1191,7 @@ "Sharded": true }, "FieldQuery": "select dt.c0 as id, weight_string(dt.c0) from (select id from `user` where 1 != 1 union select 3 from dual where 1 != 1) as dt(c0) where 1 != 1", - "Query": "select dt.c0 as id, weight_string(dt.c0) from (select id from `user` union select 3 from dual) as dt(c0)", - "Table": "`user`, dual" + "Query": "select dt.c0 as id, weight_string(dt.c0) from (select id from `user` union select 3 from dual) as dt(c0)" } ] } @@ -1280,8 +1232,7 @@ "Sharded": true }, "FieldQuery": "select dt.c0 as id, dt.c1 as id, weight_string(dt.c0), weight_string(dt.c1) from (select id, id from `user` where 1 != 1 union select id, bar from user_extra where 1 != 1) as dt(c0, c1) where 1 != 1", - "Query": "select dt.c0 as id, dt.c1 as id, weight_string(dt.c0), weight_string(dt.c1) from (select id, id from `user` union select id, bar from user_extra) as dt(c0, c1)", - "Table": "`user`, user_extra" + "Query": "select dt.c0 as id, dt.c1 as id, weight_string(dt.c0), weight_string(dt.c1) from (select id, id from `user` union select id, bar from user_extra) as dt(c0, c1)" } ] } @@ -1323,8 +1274,7 @@ "Sharded": true }, "FieldQuery": "select dt.c0 as foo, weight_string(dt.c0) from (select id + 42 as foo from `user` where 1 != 1) as dt(c0) where 1 != 1", - "Query": "select dt.c0 as foo, weight_string(dt.c0) from (select distinct id + 42 as foo from `user`) as dt(c0)", - "Table": "`user`" + "Query": "select dt.c0 as foo, weight_string(dt.c0) from (select distinct id + 42 as foo from `user`) as dt(c0)" }, { "OperatorType": "Route", @@ -1334,8 +1284,7 @@ "Sharded": false }, "FieldQuery": "select dt.c0 as foo, weight_string(dt.c0) from (select 1 + id as foo from unsharded where 1 != 1) as dt(c0) where 1 != 1", - "Query": "select dt.c0 as foo, weight_string(dt.c0) from (select distinct 1 + id as foo from unsharded) as dt(c0)", - "Table": "unsharded" + "Query": "select dt.c0 as foo, weight_string(dt.c0) from (select distinct 1 + id as foo from unsharded) as dt(c0)" } ] } @@ -1379,8 +1328,7 @@ "FieldQuery": "select kcu.`COLUMN_NAME` from information_schema.key_column_usage as kcu where 1 != 1", "Query": "select distinct kcu.`COLUMN_NAME` from information_schema.key_column_usage as kcu where kcu.table_schema = :__vtschemaname /* VARCHAR */ and kcu.`table_name` = :kcu_table_name /* VARCHAR */", "SysTableTableName": "[kcu_table_name:'user_extra']", - "SysTableTableSchema": "['user']", - "Table": "information_schema.key_column_usage" + "SysTableTableSchema": "['user']" }, { "OperatorType": "Route", @@ -1392,8 +1340,7 @@ "FieldQuery": "select kcu.`COLUMN_NAME` from information_schema.key_column_usage as kcu where 1 != 1", "Query": "select distinct kcu.`COLUMN_NAME` from information_schema.key_column_usage as kcu where kcu.table_schema = :__vtschemaname /* VARCHAR */ and kcu.`table_name` = :kcu_table_name1 /* VARCHAR */", "SysTableTableName": "[kcu_table_name1:'music']", - "SysTableTableSchema": "['user']", - "Table": "information_schema.key_column_usage" + "SysTableTableSchema": "['user']" } ] } @@ -1419,7 +1366,6 @@ }, "FieldQuery": "select `name`, foo from (select `name`, id as foo from `user` where 1 != 1 union select 'extra', user_id from user_extra where 1 != 1) as X where 1 != 1", "Query": "select `name`, foo from (select `name`, id as foo from `user` where id = 3 union select 'extra', user_id from user_extra where user_id = 3) as X", - "Table": "`user`, user_extra", "Values": [ "3" ], @@ -1472,8 +1418,7 @@ "FieldQuery": "select `CONSTRAINT_CATALOG`, `CONSTRAINT_SCHEMA`, `CONSTRAINT_NAME`, TABLE_CATALOG, TABLE_SCHEMA, `TABLE_NAME`, `COLUMN_NAME`, ORDINAL_POSITION, POSITION_IN_UNIQUE_CONSTRAINT, REFERENCED_TABLE_SCHEMA, REFERENCED_TABLE_NAME, REFERENCED_COLUMN_NAME from information_schema.key_column_usage as kcu where 1 != 1", "Query": "select distinct `CONSTRAINT_CATALOG`, `CONSTRAINT_SCHEMA`, `CONSTRAINT_NAME`, TABLE_CATALOG, TABLE_SCHEMA, `TABLE_NAME`, `COLUMN_NAME`, ORDINAL_POSITION, POSITION_IN_UNIQUE_CONSTRAINT, REFERENCED_TABLE_SCHEMA, REFERENCED_TABLE_NAME, REFERENCED_COLUMN_NAME from information_schema.key_column_usage as kcu where kcu.table_schema = :__vtschemaname /* VARCHAR */ and kcu.`table_name` = :kcu_table_name /* VARCHAR */", "SysTableTableName": "[kcu_table_name:'user_extra']", - "SysTableTableSchema": "['user']", - "Table": "information_schema.key_column_usage" + "SysTableTableSchema": "['user']" }, { "OperatorType": "Route", @@ -1485,8 +1430,7 @@ "FieldQuery": "select `CONSTRAINT_CATALOG`, `CONSTRAINT_SCHEMA`, `CONSTRAINT_NAME`, TABLE_CATALOG, TABLE_SCHEMA, `TABLE_NAME`, `COLUMN_NAME`, ORDINAL_POSITION, POSITION_IN_UNIQUE_CONSTRAINT, REFERENCED_TABLE_SCHEMA, REFERENCED_TABLE_NAME, REFERENCED_COLUMN_NAME from information_schema.key_column_usage as kcu where 1 != 1", "Query": "select distinct `CONSTRAINT_CATALOG`, `CONSTRAINT_SCHEMA`, `CONSTRAINT_NAME`, TABLE_CATALOG, TABLE_SCHEMA, `TABLE_NAME`, `COLUMN_NAME`, ORDINAL_POSITION, POSITION_IN_UNIQUE_CONSTRAINT, REFERENCED_TABLE_SCHEMA, REFERENCED_TABLE_NAME, REFERENCED_COLUMN_NAME from information_schema.key_column_usage as kcu where kcu.table_schema = :__vtschemaname /* VARCHAR */ and kcu.`table_name` = :kcu_table_name1 /* VARCHAR */", "SysTableTableName": "[kcu_table_name1:'music']", - "SysTableTableSchema": "['user']", - "Table": "information_schema.key_column_usage" + "SysTableTableSchema": "['user']" } ] } @@ -1511,8 +1455,7 @@ "Sharded": false }, "FieldQuery": "select * from (select * from unsharded where 1 != 1) as last_failed where 1 != 1 union all select * from (select * from unsharded where 1 != 1) as last_succeeded where 1 != 1", - "Query": "select * from (select * from unsharded where branchId = 203622 and buildNumber <= 113893 and state = 'FAILED' order by buildNumber desc limit 1) as last_failed union all select * from (select * from unsharded where branchId = 203622 and buildNumber <= 113893 and state = 'SUCCEEDED' order by buildNumber desc limit 1) as last_succeeded order by buildNumber desc limit 1", - "Table": "unsharded" + "Query": "select * from (select * from unsharded where branchId = 203622 and buildNumber <= 113893 and state = 'FAILED' order by buildNumber desc limit 1) as last_failed union all select * from (select * from unsharded where branchId = 203622 and buildNumber <= 113893 and state = 'SUCCEEDED' order by buildNumber desc limit 1) as last_succeeded order by buildNumber desc limit 1" }, "TablesUsed": [ "main.unsharded" @@ -1546,14 +1489,12 @@ "Sharded": false }, "FieldQuery": "select dt.c0 as id, dt.c1 as foo, dt.c2 as bar, weight_string(dt.c0), weight_string(dt.c1), weight_string(dt.c2) from (select id, foo, bar from unsharded where 1 != 1) as dt(c0, c1, c2) where 1 != 1", - "Query": "select dt.c0 as id, dt.c1 as foo, dt.c2 as bar, weight_string(dt.c0), weight_string(dt.c1), weight_string(dt.c2) from (select distinct id, foo, bar from unsharded) as dt(c0, c1, c2)", - "Table": "unsharded" + "Query": "select dt.c0 as id, dt.c1 as foo, dt.c2 as bar, weight_string(dt.c0), weight_string(dt.c1), weight_string(dt.c2) from (select distinct id, foo, bar from unsharded) as dt(c0, c1, c2)" }, { "OperatorType": "Join", "Variant": "Join", "JoinColumnIndexes": "L:0,L:1,R:0,L:2,L:3,R:1", - "TableName": "`user`_authoritative", "Inputs": [ { "OperatorType": "Route", @@ -1563,8 +1504,7 @@ "Sharded": true }, "FieldQuery": "select `user`.intcol, `user`.textcol2, weight_string(`user`.intcol), weight_string(`user`.textcol2) from `user` where 1 != 1", - "Query": "select distinct `user`.intcol, `user`.textcol2, weight_string(`user`.intcol), weight_string(`user`.textcol2) from `user`", - "Table": "`user`" + "Query": "select distinct `user`.intcol, `user`.textcol2, weight_string(`user`.intcol), weight_string(`user`.textcol2) from `user`" }, { "OperatorType": "Route", @@ -1574,8 +1514,7 @@ "Sharded": true }, "FieldQuery": "select authoritative.col2, weight_string(authoritative.col2) from authoritative where 1 != 1", - "Query": "select distinct authoritative.col2, weight_string(authoritative.col2) from authoritative", - "Table": "authoritative" + "Query": "select distinct authoritative.col2, weight_string(authoritative.col2) from authoritative" } ] } @@ -1605,8 +1544,7 @@ "Sharded": true }, "FieldQuery": "select foo, foo, foo from `user` where 1 != 1 union all select bar, baz, toto from music where 1 != 1", - "Query": "select foo, foo, foo from `user` union all select bar, baz, toto from music", - "Table": "`user`, music" + "Query": "select foo, foo, foo from `user` union all select bar, baz, toto from music" }, "TablesUsed": [ "user.music", @@ -1629,8 +1567,7 @@ "Sharded": true }, "FieldQuery": "select bar, baz, toto from music where 1 != 1 union all select foo, foo, foo from `user` where 1 != 1", - "Query": "select bar, baz, toto from music union all select foo, foo, foo from `user`", - "Table": "`user`, music" + "Query": "select bar, baz, toto from music union all select foo, foo, foo from `user`" }, "TablesUsed": [ "user.music", @@ -1662,8 +1599,7 @@ "Sharded": true }, "FieldQuery": "select dt.c0 as bar, dt.c1 as baz, dt.c2 as toto, weight_string(dt.c0), weight_string(dt.c1), weight_string(dt.c2) from (select bar, baz, toto from music where 1 != 1 union select foo, foo, foo from `user` where 1 != 1) as dt(c0, c1, c2) where 1 != 1", - "Query": "select dt.c0 as bar, dt.c1 as baz, dt.c2 as toto, weight_string(dt.c0), weight_string(dt.c1), weight_string(dt.c2) from (select bar, baz, toto from music union select foo, foo, foo from `user`) as dt(c0, c1, c2)", - "Table": "`user`, music" + "Query": "select dt.c0 as bar, dt.c1 as baz, dt.c2 as toto, weight_string(dt.c0), weight_string(dt.c1), weight_string(dt.c2) from (select bar, baz, toto from music union select foo, foo, foo from `user`) as dt(c0, c1, c2)" } ] }, @@ -1697,8 +1633,7 @@ "Sharded": true }, "FieldQuery": "select dt.c0 as foo, dt.c1 as foo, dt.c2 as foo, weight_string(dt.c0), weight_string(dt.c1), weight_string(dt.c2) from (select foo, foo, foo from `user` where 1 != 1 union select bar, baz, toto from music where 1 != 1) as dt(c0, c1, c2) where 1 != 1", - "Query": "select dt.c0 as foo, dt.c1 as foo, dt.c2 as foo, weight_string(dt.c0), weight_string(dt.c1), weight_string(dt.c2) from (select foo, foo, foo from `user` union select bar, baz, toto from music) as dt(c0, c1, c2)", - "Table": "`user`, music" + "Query": "select dt.c0 as foo, dt.c1 as foo, dt.c2 as foo, weight_string(dt.c0), weight_string(dt.c1), weight_string(dt.c2) from (select foo, foo, foo from `user` union select bar, baz, toto from music) as dt(c0, c1, c2)" } ] }, @@ -1722,7 +1657,6 @@ "JoinVars": { "t1_foo": 0 }, - "TableName": "`user`_music", "Inputs": [ { "OperatorType": "Distinct", @@ -1738,8 +1672,7 @@ "Sharded": true }, "FieldQuery": "select dt.c0 as foo, weight_string(dt.c0) from (select foo from `user` where 1 != 1 union select foo from `user` where 1 != 1) as dt(c0) where 1 != 1", - "Query": "select dt.c0 as foo, weight_string(dt.c0) from (select foo from `user` where bar = 12 union select foo from `user` where bar = 134) as dt(c0)", - "Table": "`user`" + "Query": "select dt.c0 as foo, weight_string(dt.c0) from (select foo from `user` where bar = 12 union select foo from `user` where bar = 134) as dt(c0)" } ] }, @@ -1757,8 +1690,7 @@ "Sharded": true }, "FieldQuery": "select dt.c0 as bar, weight_string(dt.c0) from (select bar from music where 1 != 1 union select bar from music where 1 != 1) as dt(c0) where 1 != 1", - "Query": "select dt.c0 as bar, weight_string(dt.c0) from (select bar from music where foo = 12 and bar = :t1_foo union select bar from music where foo = 1234 and bar = :t1_foo) as dt(c0)", - "Table": "music" + "Query": "select dt.c0 as bar, weight_string(dt.c0) from (select bar from music where foo = 12 and bar = :t1_foo union select bar from music where foo = 1234 and bar = :t1_foo) as dt(c0)" } ] } @@ -1791,8 +1723,7 @@ "Sharded": true }, "FieldQuery": "select 1 from `user` where 1 != 1 union select 2 from `user` where 1 != 1", - "Query": "select 1 from `user` union select 2 from `user`", - "Table": "`user`" + "Query": "select 1 from `user` union select 2 from `user`" } ] }, @@ -1822,8 +1753,7 @@ "Sharded": true }, "FieldQuery": "select col1 from `user` where 1 != 1 union select 3 from `user` where 1 != 1", - "Query": "select col1 from `user` union select 3 from `user`", - "Table": "`user`" + "Query": "select col1 from `user` union select 3 from `user`" } ] }, @@ -1853,8 +1783,7 @@ "Sharded": true }, "FieldQuery": "select 3 from `user` where 1 != 1 union select col1 from `user` where 1 != 1", - "Query": "select 3 from `user` union select col1 from `user`", - "Table": "`user`" + "Query": "select 3 from `user` union select col1 from `user`" } ] }, @@ -1884,8 +1813,7 @@ "Sharded": true }, "FieldQuery": "select 3 from `user` where 1 != 1 union select now() from `user` where 1 != 1", - "Query": "select 3 from `user` union select now() from `user`", - "Table": "`user`" + "Query": "select 3 from `user` union select now() from `user`" } ] }, @@ -1915,8 +1843,7 @@ "Sharded": true }, "FieldQuery": "select now() from `user` where 1 != 1 union select 3 from `user` where 1 != 1", - "Query": "select now() from `user` union select 3 from `user`", - "Table": "`user`" + "Query": "select now() from `user` union select 3 from `user`" } ] }, @@ -1946,8 +1873,7 @@ "Sharded": true }, "FieldQuery": "select now() from `user` where 1 != 1 union select id from `user` where 1 != 1", - "Query": "select now() from `user` union select id from `user`", - "Table": "`user`" + "Query": "select now() from `user` union select id from `user`" } ] }, @@ -1982,8 +1908,7 @@ }, "FieldQuery": "select 'a' as type, 0 as id, '' from `user` where 1 != 1 group by ''", "OrderBy": "2 ASC COLLATE utf8mb4_0900_ai_ci", - "Query": "select 'a' as type, 0 as id, '' from `user` group by '' order by '' asc", - "Table": "`user`" + "Query": "select 'a' as type, 0 as id, '' from `user` group by '' order by '' asc" } ] }, @@ -1995,8 +1920,7 @@ "Sharded": true }, "FieldQuery": "select 'c' as type, 0 as id from user_extra as t where 1 != 1", - "Query": "select 'c' as type, 0 as id from user_extra as t", - "Table": "user_extra" + "Query": "select 'c' as type, 0 as id from user_extra as t" } ] }, diff --git a/go/vt/vtgate/planbuilder/testdata/vexplain_cases.json b/go/vt/vtgate/planbuilder/testdata/vexplain_cases.json index 6453127045c..07b17f19617 100644 --- a/go/vt/vtgate/planbuilder/testdata/vexplain_cases.json +++ b/go/vt/vtgate/planbuilder/testdata/vexplain_cases.json @@ -34,8 +34,7 @@ "Sharded": true }, "FieldQuery": "select * from `user` where 1 != 1", - "Query": "select * from `user`", - "Table": "`user`" + "Query": "select * from `user`" } ] }, @@ -63,8 +62,7 @@ "Sharded": true }, "FieldQuery": "select * from `user` where 1 != 1", - "Query": "select * from `user`", - "Table": "`user`" + "Query": "select * from `user`" } ] }, diff --git a/go/vt/vtgate/planbuilder/testdata/vindex_func_cases.json b/go/vt/vtgate/planbuilder/testdata/vindex_func_cases.json index 5d62aa7258c..71c71929f61 100644 --- a/go/vt/vtgate/planbuilder/testdata/vindex_func_cases.json +++ b/go/vt/vtgate/planbuilder/testdata/vindex_func_cases.json @@ -157,7 +157,6 @@ "OperatorType": "Join", "Variant": "Join", "JoinColumnIndexes": "L:0,R:0", - "TableName": "_unsharded", "Inputs": [ { "OperatorType": "VindexFunc", @@ -179,8 +178,7 @@ "Sharded": false }, "FieldQuery": "select unsharded.id from unsharded where 1 != 1", - "Query": "select unsharded.id from unsharded", - "Table": "unsharded" + "Query": "select unsharded.id from unsharded" } ] }, @@ -201,7 +199,6 @@ "OperatorType": "Join", "Variant": "Join", "JoinColumnIndexes": "R:0,L:0", - "TableName": "unsharded_", "Inputs": [ { "OperatorType": "Route", @@ -211,8 +208,7 @@ "Sharded": false }, "FieldQuery": "select unsharded.id from unsharded where 1 != 1", - "Query": "select unsharded.id from unsharded", - "Table": "unsharded" + "Query": "select unsharded.id from unsharded" }, { "OperatorType": "VindexFunc", @@ -248,7 +244,6 @@ "JoinVars": { "user_index_id": 0 }, - "TableName": "_unsharded", "Inputs": [ { "OperatorType": "VindexFunc", @@ -272,8 +267,7 @@ "Sharded": false }, "FieldQuery": "select unsharded.id from unsharded where 1 != 1", - "Query": "select unsharded.id from unsharded where unsharded.id = :user_index_id /* VARBINARY */", - "Table": "unsharded" + "Query": "select unsharded.id from unsharded where unsharded.id = :user_index_id /* VARBINARY */" } ] }, @@ -297,7 +291,6 @@ "JoinVars": { "user_index_id": 1 }, - "TableName": "_unsharded", "Inputs": [ { "OperatorType": "VindexFunc", @@ -321,8 +314,7 @@ "Sharded": false }, "FieldQuery": "select unsharded.id from unsharded where 1 != 1", - "Query": "select unsharded.id from unsharded where unsharded.id = :user_index_id /* VARBINARY */", - "Table": "unsharded" + "Query": "select unsharded.id from unsharded where unsharded.id = :user_index_id /* VARBINARY */" } ] }, @@ -346,7 +338,6 @@ "JoinVars": { "user_index_id": 1 }, - "TableName": "_unsharded", "Inputs": [ { "OperatorType": "VindexFunc", @@ -370,8 +361,7 @@ "Sharded": false }, "FieldQuery": "select unsharded.id from unsharded where 1 != 1", - "Query": "select unsharded.id from unsharded where unsharded.id = :user_index_id /* VARBINARY */", - "Table": "unsharded" + "Query": "select unsharded.id from unsharded where unsharded.id = :user_index_id /* VARBINARY */" } ] }, @@ -395,7 +385,6 @@ "JoinVars": { "ui_id": 1 }, - "TableName": "_unsharded", "Inputs": [ { "OperatorType": "VindexFunc", @@ -419,8 +408,7 @@ "Sharded": false }, "FieldQuery": "select unsharded.id from unsharded where 1 != 1", - "Query": "select unsharded.id from unsharded where unsharded.id = :ui_id /* VARBINARY */", - "Table": "unsharded" + "Query": "select unsharded.id from unsharded where unsharded.id = :ui_id /* VARBINARY */" } ] }, diff --git a/go/vt/vtgate/planbuilder/testdata/wireup_cases.json b/go/vt/vtgate/planbuilder/testdata/wireup_cases.json index 4b2ea65923f..00d8470d094 100644 --- a/go/vt/vtgate/planbuilder/testdata/wireup_cases.json +++ b/go/vt/vtgate/planbuilder/testdata/wireup_cases.json @@ -13,7 +13,6 @@ "JoinVars": { "e_id": 1 }, - "TableName": "user_extra_`user`", "Inputs": [ { "OperatorType": "Route", @@ -23,8 +22,7 @@ "Sharded": true }, "FieldQuery": "select e.col, e.id as eid from user_extra as e where 1 != 1", - "Query": "select e.col, e.id as eid from user_extra as e", - "Table": "user_extra" + "Query": "select e.col, e.id as eid from user_extra as e" }, { "OperatorType": "Route", @@ -35,7 +33,6 @@ }, "FieldQuery": "select u.id as uid from `user` as u where 1 != 1", "Query": "select u.id as uid from `user` as u where u.id = :e_id", - "Table": "`user`", "Values": [ ":e_id" ], @@ -63,7 +60,6 @@ "JoinVars": { "e_id": 1 }, - "TableName": "user_extra_`user`", "Inputs": [ { "OperatorType": "Route", @@ -73,8 +69,7 @@ "Sharded": true }, "FieldQuery": "select e.col, e.id as eid from user_extra as e where 1 != 1", - "Query": "select e.col, e.id as eid from user_extra as e where e.col = :uid", - "Table": "user_extra" + "Query": "select e.col, e.id as eid from user_extra as e where e.col = :uid" }, { "OperatorType": "Route", @@ -85,7 +80,6 @@ }, "FieldQuery": "select u.id as uid from `user` as u where 1 != 1", "Query": "select u.id as uid from `user` as u where u.id = :e_id", - "Table": "`user`", "Values": [ ":e_id" ], @@ -110,7 +104,6 @@ "OperatorType": "Join", "Variant": "Join", "JoinColumnIndexes": "R:0", - "TableName": "`user`_`user`_`user`", "Inputs": [ { "OperatorType": "Route", @@ -120,8 +113,7 @@ "Sharded": true }, "FieldQuery": "select 1 from `user` as u2 where 1 != 1", - "Query": "select 1 from `user` as u2", - "Table": "`user`" + "Query": "select 1 from `user` as u2" }, { "OperatorType": "Join", @@ -130,7 +122,6 @@ "JoinVars": { "u1_col": 1 }, - "TableName": "`user`_`user`", "Inputs": [ { "OperatorType": "Route", @@ -140,8 +131,7 @@ "Sharded": true }, "FieldQuery": "select u1.id, u1.col from `user` as u1 where 1 != 1", - "Query": "select u1.id, u1.col from `user` as u1", - "Table": "`user`" + "Query": "select u1.id, u1.col from `user` as u1" }, { "OperatorType": "Route", @@ -151,8 +141,7 @@ "Sharded": true }, "FieldQuery": "select 1 from `user` as u3 where 1 != 1", - "Query": "select 1 from `user` as u3 where u3.col = :u1_col /* INT16 */", - "Table": "`user`" + "Query": "select 1 from `user` as u3 where u3.col = :u1_col /* INT16 */" } ] } @@ -174,7 +163,6 @@ "OperatorType": "Join", "Variant": "Join", "JoinColumnIndexes": "L:0", - "TableName": "`user`_`user`_`user`", "Inputs": [ { "OperatorType": "Route", @@ -184,8 +172,7 @@ "Sharded": true }, "FieldQuery": "select u1.id from `user` as u1 where 1 != 1", - "Query": "select u1.id from `user` as u1", - "Table": "`user`" + "Query": "select u1.id from `user` as u1" }, { "OperatorType": "Join", @@ -193,7 +180,6 @@ "JoinVars": { "u2_col": 0 }, - "TableName": "`user`_`user`", "Inputs": [ { "OperatorType": "Route", @@ -203,8 +189,7 @@ "Sharded": true }, "FieldQuery": "select u2.col from `user` as u2 where 1 != 1", - "Query": "select u2.col from `user` as u2", - "Table": "`user`" + "Query": "select u2.col from `user` as u2" }, { "OperatorType": "Route", @@ -214,8 +199,7 @@ "Sharded": true }, "FieldQuery": "select 1 from `user` as u3 where 1 != 1", - "Query": "select 1 from `user` as u3 where u3.col = :u2_col /* INT16 */", - "Table": "`user`" + "Query": "select 1 from `user` as u3 where u3.col = :u2_col /* INT16 */" } ] } @@ -240,7 +224,6 @@ "JoinVars": { "u3_col": 0 }, - "TableName": "`user`_`user`_`user`", "Inputs": [ { "OperatorType": "Route", @@ -250,8 +233,7 @@ "Sharded": true }, "FieldQuery": "select u3.col from `user` as u3 where 1 != 1", - "Query": "select u3.col from `user` as u3", - "Table": "`user`" + "Query": "select u3.col from `user` as u3" }, { "OperatorType": "Join", @@ -260,7 +242,6 @@ "JoinVars": { "u1_col": 1 }, - "TableName": "`user`_`user`", "Inputs": [ { "OperatorType": "Route", @@ -270,8 +251,7 @@ "Sharded": true }, "FieldQuery": "select u1.id, u1.col from `user` as u1 where 1 != 1", - "Query": "select u1.id, u1.col from `user` as u1 where u1.col = :u3_col /* INT16 */", - "Table": "`user`" + "Query": "select u1.id, u1.col from `user` as u1 where u1.col = :u3_col /* INT16 */" }, { "OperatorType": "Route", @@ -281,8 +261,7 @@ "Sharded": true }, "FieldQuery": "select 1 from `user` as u2 where 1 != 1", - "Query": "select 1 from `user` as u2 where u2.col = :u1_col /* INT16 */", - "Table": "`user`" + "Query": "select 1 from `user` as u2 where u2.col = :u1_col /* INT16 */" } ] } @@ -304,7 +283,6 @@ "OperatorType": "Join", "Variant": "Join", "JoinColumnIndexes": "R:0", - "TableName": "`user`_`user`_`user`_`user`", "Inputs": [ { "OperatorType": "Route", @@ -314,8 +292,7 @@ "Sharded": true }, "FieldQuery": "select 1 from `user` as u2 where 1 != 1", - "Query": "select 1 from `user` as u2", - "Table": "`user`" + "Query": "select 1 from `user` as u2" }, { "OperatorType": "Join", @@ -324,7 +301,6 @@ "JoinVars": { "u4_col": 0 }, - "TableName": "`user`_`user`_`user`", "Inputs": [ { "OperatorType": "Route", @@ -334,8 +310,7 @@ "Sharded": true }, "FieldQuery": "select u4.col from `user` as u4 where 1 != 1", - "Query": "select u4.col from `user` as u4", - "Table": "`user`" + "Query": "select u4.col from `user` as u4" }, { "OperatorType": "Join", @@ -344,7 +319,6 @@ "JoinVars": { "u1_col": 1 }, - "TableName": "`user`_`user`", "Inputs": [ { "OperatorType": "Route", @@ -354,8 +328,7 @@ "Sharded": true }, "FieldQuery": "select u1.id, u1.col from `user` as u1 where 1 != 1", - "Query": "select u1.id, u1.col from `user` as u1 where u1.col = :u4_col /* INT16 */", - "Table": "`user`" + "Query": "select u1.id, u1.col from `user` as u1 where u1.col = :u4_col /* INT16 */" }, { "OperatorType": "Route", @@ -366,7 +339,6 @@ }, "FieldQuery": "select 1 from `user` as u3 where 1 != 1", "Query": "select 1 from `user` as u3 where u3.id = :u1_col /* INT16 */", - "Table": "`user`", "Values": [ ":u1_col" ], @@ -397,7 +369,6 @@ "JoinVars": { "u1_col": 1 }, - "TableName": "`user`_`user`_`user`", "Inputs": [ { "OperatorType": "Join", @@ -406,7 +377,6 @@ "JoinVars": { "u1_col": 1 }, - "TableName": "`user`_`user`", "Inputs": [ { "OperatorType": "Route", @@ -416,8 +386,7 @@ "Sharded": true }, "FieldQuery": "select u1.id, u1.col from `user` as u1 where 1 != 1", - "Query": "select u1.id, u1.col from `user` as u1", - "Table": "`user`" + "Query": "select u1.id, u1.col from `user` as u1" }, { "OperatorType": "Route", @@ -428,7 +397,6 @@ }, "FieldQuery": "select 1 from `user` as u2 where 1 != 1", "Query": "select 1 from `user` as u2 where u2.id = :u1_col /* INT16 */", - "Table": "`user`", "Values": [ ":u1_col" ], @@ -445,7 +413,6 @@ }, "FieldQuery": "select 1 from `user` as u3 where 1 != 1", "Query": "select 1 from `user` as u3 where u3.id = :u1_col /* INT16 */", - "Table": "`user`", "Values": [ ":u1_col" ], @@ -472,7 +439,6 @@ "JoinVars": { "unsharded_id": 1 }, - "TableName": "unsharded_`weird``name`", "Inputs": [ { "OperatorType": "Route", @@ -482,8 +448,7 @@ "Sharded": false }, "FieldQuery": "select unsharded.b, unsharded.id from unsharded where 1 != 1", - "Query": "select unsharded.b, unsharded.id from unsharded", - "Table": "unsharded" + "Query": "select unsharded.b, unsharded.id from unsharded" }, { "OperatorType": "Route", @@ -494,7 +459,6 @@ }, "FieldQuery": "select `weird``name`.a from `weird``name` where 1 != 1", "Query": "select `weird``name`.a from `weird``name` where `weird``name`.`a``b*c` = :unsharded_id", - "Table": "`weird``name`", "Values": [ ":unsharded_id" ], @@ -522,7 +486,6 @@ "JoinVars": { "unsharded_id": 1 }, - "TableName": "unsharded_`weird``name`", "Inputs": [ { "OperatorType": "Route", @@ -532,8 +495,7 @@ "Sharded": false }, "FieldQuery": "select unsharded.b, unsharded.id from unsharded where 1 != 1", - "Query": "select unsharded.b, unsharded.id from unsharded", - "Table": "unsharded" + "Query": "select unsharded.b, unsharded.id from unsharded" }, { "OperatorType": "Route", @@ -544,7 +506,6 @@ }, "FieldQuery": "select 1 from `weird``name` where 1 != 1", "Query": "select 1 from `weird``name` where `weird``name`.`a``b*c` = :unsharded_id", - "Table": "`weird``name`", "Values": [ ":unsharded_id" ], @@ -576,7 +537,6 @@ "JoinVars": { "u_col": 1 }, - "TableName": "`user`_user_extra", "Inputs": [ { "OperatorType": "Route", @@ -586,8 +546,7 @@ "Sharded": true }, "FieldQuery": "select u.id, u.col from `user` as u where 1 != 1", - "Query": "select u.id, u.col from `user` as u", - "Table": "`user`" + "Query": "select u.id, u.col from `user` as u" }, { "OperatorType": "Limit", @@ -601,8 +560,7 @@ "Sharded": true }, "FieldQuery": "select e.id from user_extra as e where 1 != 1", - "Query": "select e.id from user_extra as e where e.id = :u_col /* INT16 */ limit 10", - "Table": "user_extra" + "Query": "select e.id from user_extra as e where e.id = :u_col /* INT16 */ limit 10" } ] } @@ -644,7 +602,6 @@ "u_col": 1, "u_id": 0 }, - "TableName": "`user`_user_extra", "Inputs": [ { "OperatorType": "Route", @@ -654,8 +611,7 @@ "Sharded": true }, "FieldQuery": "select u.id, u.col from `user` as u where 1 != 1", - "Query": "select u.id, u.col from `user` as u", - "Table": "`user`" + "Query": "select u.id, u.col from `user` as u" }, { "OperatorType": "Limit", @@ -669,8 +625,7 @@ "Sharded": true }, "FieldQuery": "select :u_id + e.id as `u.id + e.id` from user_extra as e where 1 != 1", - "Query": "select :u_id + e.id as `u.id + e.id` from user_extra as e where e.id = :u_col /* INT16 */ limit 10", - "Table": "user_extra" + "Query": "select :u_id + e.id as `u.id + e.id` from user_extra as e where e.id = :u_col /* INT16 */ limit 10" } ] } @@ -688,7 +643,6 @@ }, "FieldQuery": "select 1 from `user` where 1 != 1", "Query": "select 1 from `user` where :__sq_has_values and id in ::__vals", - "Table": "`user`", "Values": [ "::__sq1" ], @@ -720,7 +674,6 @@ "JoinVars": { "u_col": 2 }, - "TableName": "`user`_user_extra", "Inputs": [ { "OperatorType": "UncorrelatedSubquery", @@ -738,8 +691,7 @@ "Sharded": true }, "FieldQuery": "select col from `user` where 1 != 1", - "Query": "select col from `user`", - "Table": "`user`" + "Query": "select col from `user`" }, { "InputName": "Outer", @@ -750,8 +702,7 @@ "Sharded": true }, "FieldQuery": "select u.id, :__sq1 /* INT16 */ as `(select col from ``user``)`, u.col from `user` as u where 1 != 1", - "Query": "select u.id, :__sq1 /* INT16 */ as `(select col from ``user``)`, u.col from `user` as u", - "Table": "`user`" + "Query": "select u.id, :__sq1 /* INT16 */ as `(select col from ``user``)`, u.col from `user` as u" } ] }, @@ -763,8 +714,7 @@ "Sharded": true }, "FieldQuery": "select e.id from user_extra as e where 1 != 1", - "Query": "select e.id from user_extra as e where e.id = :u_col /* INT16 */", - "Table": "user_extra" + "Query": "select e.id from user_extra as e where e.id = :u_col /* INT16 */" } ] } @@ -792,7 +742,6 @@ }, "FieldQuery": "select id from `user` where 1 != 1", "Query": "select id from `user` where id in ::__vals", - "Table": "`user`", "Values": [ "(18446744073709551616, 1)" ], @@ -814,7 +763,6 @@ "OperatorType": "Join", "Variant": "Join", "JoinColumnIndexes": "L:0", - "TableName": "`user`_`user`", "Inputs": [ { "OperatorType": "Route", @@ -825,7 +773,6 @@ }, "FieldQuery": "select u1.id from `user` as u1 where 1 != 1", "Query": "select u1.id from `user` as u1 where u1.id = 18446744073709551616", - "Table": "`user`", "Values": [ "18446744073709551616" ], @@ -839,8 +786,7 @@ "Sharded": true }, "FieldQuery": "select 1 from `user` as u2 where 1 != 1", - "Query": "select 1 from `user` as u2", - "Table": "`user`" + "Query": "select 1 from `user` as u2" } ] }, @@ -860,7 +806,6 @@ "OperatorType": "Join", "Variant": "Join", "JoinColumnIndexes": "L:0", - "TableName": "`user`_`user`", "Inputs": [ { "OperatorType": "Route", @@ -870,8 +815,7 @@ "Sharded": true }, "FieldQuery": "select u1.id from `user` as u1 where 1 != 1", - "Query": "select u1.id from `user` as u1", - "Table": "`user`" + "Query": "select u1.id from `user` as u1" }, { "OperatorType": "Route", @@ -882,7 +826,6 @@ }, "FieldQuery": "select 1 from `user` as u2 where 1 != 1", "Query": "select 1 from `user` as u2 where u2.id = 18446744073709551616", - "Table": "`user`", "Values": [ "18446744073709551616" ], @@ -923,7 +866,6 @@ }, "FieldQuery": "select `name`, keyspace_id from name_user_vdx where 1 != 1", "Query": "select `name`, keyspace_id from name_user_vdx where `name` in ::__vals", - "Table": "name_user_vdx", "Values": [ "::name" ], @@ -937,8 +879,7 @@ "Sharded": true }, "FieldQuery": "select u.a from (select id as b, `name` from `user` where 1 != 1) as u(a, n) where 1 != 1", - "Query": "select u.a from (select id as b, `name` from `user` where `name` = 1) as u(a, n)", - "Table": "`user`" + "Query": "select u.a from (select id as b, `name` from `user` where `name` = 1) as u(a, n)" } ] }, @@ -958,13 +899,11 @@ "OperatorType": "Join", "Variant": "Join", "JoinColumnIndexes": "L:0", - "TableName": "`user`_unsharded_unsharded", "Inputs": [ { "OperatorType": "Join", "Variant": "Join", "JoinColumnIndexes": "L:0", - "TableName": "`user`_unsharded", "Inputs": [ { "OperatorType": "Route", @@ -974,8 +913,7 @@ "Sharded": true }, "FieldQuery": "select `user`.col from `user` where 1 != 1", - "Query": "select /*vt+ PLANNER=left2right */ `user`.col from `user`", - "Table": "`user`" + "Query": "select /*vt+ PLANNER=left2right */ `user`.col from `user`" }, { "OperatorType": "Route", @@ -985,8 +923,7 @@ "Sharded": false }, "FieldQuery": "select 1 from unsharded as m1 where 1 != 1", - "Query": "select /*vt+ PLANNER=left2right */ 1 from unsharded as m1", - "Table": "unsharded" + "Query": "select /*vt+ PLANNER=left2right */ 1 from unsharded as m1" } ] }, @@ -998,8 +935,7 @@ "Sharded": false }, "FieldQuery": "select 1 from unsharded as m2 where 1 != 1", - "Query": "select /*vt+ PLANNER=left2right */ 1 from unsharded as m2", - "Table": "unsharded" + "Query": "select /*vt+ PLANNER=left2right */ 1 from unsharded as m2" } ] }, diff --git a/go/vt/vtgate/plantests/prepared_statements.json b/go/vt/vtgate/plantests/prepared_statements.json index 7c7ea8f9ac9..63581648ab1 100644 --- a/go/vt/vtgate/plantests/prepared_statements.json +++ b/go/vt/vtgate/plantests/prepared_statements.json @@ -32,7 +32,6 @@ }, "FieldQuery": "select 1 from `user` where 1 != 1", "Query": "select distinct 1 from `user` where id = :v1", - "Table": "`user`", "Values": [ ":v1" ], @@ -47,7 +46,6 @@ }, "FieldQuery": "select 1 from user_extra where 1 != 1", "Query": "select distinct 1 from user_extra where user_id = :v2", - "Table": "user_extra", "Values": [ ":v2" ], @@ -68,7 +66,6 @@ "Conditions": "v1=v2", "FieldQuery": "select 1 from `user` where 1 != 1 union select 1 from user_extra where 1 != 1", "Query": "select 1 from `user` where id = :v1 union select 1 from user_extra where user_id = :v2", - "Table": "`user`, user_extra", "Values": [ ":v1" ], @@ -111,7 +108,6 @@ }, "FieldQuery": "select 1 from `user` where 1 != 1", "Query": "select distinct 1 from `user` where id = :v1", - "Table": "`user`", "Values": [ ":v1" ], @@ -126,7 +122,6 @@ }, "FieldQuery": "select 1 from user_extra where 1 != 1", "Query": "select distinct 1 from user_extra where user_id = :v2", - "Table": "user_extra", "Values": [ ":v2" ], @@ -161,7 +156,6 @@ "OperatorType": "Join", "Variant": "Join", "JoinColumnIndexes": "L:0", - "TableName": "`user`_user_extra", "Inputs": [ { "OperatorType": "Route", @@ -172,7 +166,6 @@ }, "FieldQuery": "select 1 from `user` where 1 != 1", "Query": "select 1 from `user` where `user`.id = :v1", - "Table": "`user`", "Values": [ ":v1" ], @@ -187,7 +180,6 @@ }, "FieldQuery": "select 1 from user_extra where 1 != 1", "Query": "select 1 from user_extra where user_extra.user_id = :v2", - "Table": "user_extra", "Values": [ ":v2" ], @@ -206,7 +198,6 @@ "Conditions": "v1=v2", "FieldQuery": "select 1 from `user`, user_extra where 1 != 1", "Query": "select 1 from `user`, user_extra where `user`.id = :v1 and user_extra.user_id = :v2", - "Table": "`user`, user_extra", "Values": [ ":v1" ], @@ -235,7 +226,6 @@ "OperatorType": "Join", "Variant": "Join", "JoinColumnIndexes": "L:0", - "TableName": "`user`_user_extra", "Inputs": [ { "OperatorType": "Route", @@ -246,7 +236,6 @@ }, "FieldQuery": "select 1 from `user` where 1 != 1", "Query": "select 1 from `user` where `user`.id = :v1", - "Table": "`user`", "Values": [ ":v1" ], @@ -261,7 +250,6 @@ }, "FieldQuery": "select 1 from user_extra where 1 != 1", "Query": "select 1 from user_extra where user_extra.user_id = :v2", - "Table": "user_extra", "Values": [ ":v2" ], @@ -307,7 +295,6 @@ }, "FieldQuery": "select count(*) from user_extra where 1 != 1", "Query": "select count(*) from user_extra where user_id = :v1", - "Table": "user_extra", "Values": [ ":v1" ], @@ -323,7 +310,6 @@ }, "FieldQuery": "select :__sq1 /* INT64 */ as `(select count(*) from user_extra where user_id = :v1)` from `user` where 1 != 1", "Query": "select :__sq1 /* INT64 */ as `(select count(*) from user_extra where user_id = :v1)` from `user` where id = :v2", - "Table": "`user`", "Values": [ ":v2" ], @@ -342,7 +328,6 @@ "Conditions": "v1=v2", "FieldQuery": "select (select count(*) from user_extra where 1 != 1) from `user` where 1 != 1", "Query": "select (select count(*) from user_extra where user_id = :v1) from `user` where id = :v2", - "Table": "`user`", "Values": [ ":v2" ], @@ -384,7 +369,6 @@ }, "FieldQuery": "select count(*) from user_extra where 1 != 1", "Query": "select count(*) from user_extra where user_id = :v1", - "Table": "user_extra", "Values": [ ":v1" ], @@ -400,7 +384,6 @@ }, "FieldQuery": "select :__sq1 /* INT64 */ as `(select count(*) from user_extra where user_id = :v1)` from `user` where 1 != 1", "Query": "select :__sq1 /* INT64 */ as `(select count(*) from user_extra where user_id = :v1)` from `user` where id = :v2", - "Table": "`user`", "Values": [ ":v2" ], @@ -442,7 +425,6 @@ }, "FieldQuery": "select count(*) from user_extra where 1 != 1", "Query": "select count(*) from user_extra where user_id = :v1", - "Table": "user_extra", "Values": [ ":v1" ], @@ -458,7 +440,6 @@ }, "FieldQuery": "select :__sq1 /* INT64 */ as `(select count(*) from user_extra where user_id = :v1)` from `user` where 1 != 1", "Query": "select :__sq1 /* INT64 */ as `(select count(*) from user_extra where user_id = :v1)` from `user` where id = :v2", - "Table": "`user`", "Values": [ ":v2" ], @@ -498,7 +479,6 @@ "Conditions": "v1=v2", "FieldQuery": "select (select count(*) from user_extra where 1 != 1) from `user` where 1 != 1", "Query": "select (select count(*) from user_extra where user_id = :v1 and foo = `user`.bar) from `user` where id = :v2", - "Table": "`user`", "Values": [ ":v2" ], diff --git a/go/vt/vtgate/vindexes/lookup_internal.go b/go/vt/vtgate/vindexes/lookup_internal.go index 5e224259d1d..6293209f31f 100644 --- a/go/vt/vtgate/vindexes/lookup_internal.go +++ b/go/vt/vtgate/vindexes/lookup_internal.go @@ -223,7 +223,7 @@ func (lkp *lookupInternal) VerifyCustom(ctx context.Context, vcursor VCursor, id if err != nil { return nil, vterrors.Wrap(err, "lookup.Verify") } - out[i] = (len(result.Rows) != 0) + out[i] = len(result.Rows) != 0 } return out, nil }