update to latest and suppress vtgate logging

.pullapprove.yml

@@ -28,4 +28,5 @@ groups:
       - pivanof
       - pivanof-bot
       - wangyipei01
+      - wangyipei01-bot
 

data/test/tabletserver/exec_cases.txt

@@ -578,7 +578,8 @@
   "FullQuery": "update b set eid = 1",
   "OuterQuery": "update b set eid = 1 where :#pk",
   "Subquery": "select eid, id from b limit :#maxLimit for update",
-  "SecondaryPKValues": [1, null]
+  "SecondaryPKValues": [1, null],
+  "WhereClause": ""
 }
 
 # type mismatch
@@ -591,7 +592,8 @@
   "PlanID": "PASS_DML",
   "Reason": "PK_CHANGE",
   "TableName": "b",
-  "FullQuery": "update b set eid = foo()"
+  "FullQuery": "update b set eid = foo()",
+  "WhereClause": ""
 }
 
 # update subquery
@@ -601,7 +603,8 @@
   "TableName": "a",
   "FullQuery": "update a set name = 'foo'",
   "OuterQuery": "update a set name = 'foo' where :#pk",
-  "Subquery": "select eid, id from a limit :#maxLimit for update"
+  "Subquery": "select eid, id from a limit :#maxLimit for update",
+  "WhereClause": ""
 }
 
 # update complex where clause
@@ -611,7 +614,8 @@
   "TableName": "a",
   "FullQuery": "update a set name = 'foo' where eid + 1 = 1",
   "OuterQuery": "update a set name = 'foo' where :#pk",
-  "Subquery": "select eid, id from a where eid + 1 = 1 limit :#maxLimit for update"
+  "Subquery": "select eid, id from a where eid + 1 = 1 limit :#maxLimit for update",
+  "WhereClause": " where eid + 1 = 1"
 }
 
 # pk
@@ -621,7 +625,8 @@
   "TableName": "a",
   "FullQuery": "update a set name = 'foo' where eid = 1 and id = 1",
   "OuterQuery": "update a set name = 'foo' where :#pk",
-  "PKValues": [1, 1]
+  "PKValues": [1, 1],
+  "WhereClause": " where eid = 1 and id = 1"
 }
 
 # partial pk
@@ -631,7 +636,8 @@
   "TableName": "a",
   "FullQuery": "update a set name = 'foo' where eid = 1",
   "OuterQuery": "update a set name = 'foo' where :#pk",
-  "Subquery": "select eid, id from a where eid = 1 limit :#maxLimit for update"
+  "Subquery": "select eid, id from a where eid = 1 limit :#maxLimit for update",
+  "WhereClause": " where eid = 1"
 }
 
 # bad pk
@@ -641,7 +647,8 @@
   "TableName": "a",
   "FullQuery": "update a set name = 'foo' where eid = 1.0 and id = 1",
   "OuterQuery": "update a set name = 'foo' where :#pk",
-  "Subquery": "select eid, id from a where eid = 1.0 and id = 1 limit :#maxLimit for update"
+  "Subquery": "select eid, id from a where eid = 1.0 and id = 1 limit :#maxLimit for update",
+  "WhereClause": " where eid = 1.0 and id = 1"
 }
 
 # partial pk with limit
@@ -651,7 +658,8 @@
   "TableName": "a",
   "FullQuery": "update a set name = 'foo' where eid = 1 limit 10",
   "OuterQuery": "update a set name = 'foo' where :#pk",
-  "Subquery": "select eid, id from a where eid = 1 limit 10 for update"
+  "Subquery": "select eid, id from a where eid = 1 limit 10 for update",
+  "WhereClause": " where eid = 1"
 }
 
 # non-pk
@@ -661,7 +669,8 @@
   "TableName": "a",
   "FullQuery": "update a set name = 'foo' where eid = 1 and name = 'foo'",
   "OuterQuery": "update a set name = 'foo' where :#pk",
-  "Subquery": "select eid, id from a where eid = 1 and name = 'foo' limit :#maxLimit for update"
+  "Subquery": "select eid, id from a where eid = 1 and name = 'foo' limit :#maxLimit for update",
+  "WhereClause": " where eid = 1 and name = 'foo'"
 }
 
 # no index
@@ -670,7 +679,8 @@
   "PlanID": "PASS_DML",
   "Reason": "TABLE_NOINDEX",
   "TableName": "c",
-  "FullQuery": "update c set eid = 1"
+  "FullQuery": "update c set eid = 1",
+  "WhereClause": ""
 }
 
 # complex expression in where
@@ -680,7 +690,8 @@
   "TableName":"a",
   "FullQuery":"update a set name = 'foo' where eid + 1 = 1 and id = 1",
   "OuterQuery":"update a set name = 'foo' where :#pk",
-  "Subquery":"select eid, id from a where eid + 1 = 1 and id = 1 limit :#maxLimit for update"
+  "Subquery":"select eid, id from a where eid + 1 = 1 and id = 1 limit :#maxLimit for update",
+  "WhereClause": " where eid + 1 = 1 and id = 1"
 }
 
 # parenthesized expressions in where
@@ -690,7 +701,8 @@
   "TableName": "a",
   "FullQuery": "update a set name = 'foo' where (eid = 1) and id = 1",
   "OuterQuery": "update a set name = 'foo' where :#pk",
-  "PKValues": [1, 1]
+  "PKValues": [1, 1],
+  "WhereClause": " where (eid = 1) and id = 1"
 }
 
 # in clause expression in where
@@ -700,7 +712,8 @@
   "TableName":"a",
   "FullQuery":"update a set name = 'foo' where eid in (1, 2) and id = 1",
   "OuterQuery":"update a set name = 'foo' where :#pk",
-  "PKValues":[[1,2],1]
+  "PKValues":[[1,2],1],
+  "WhereClause": " where eid in (1, 2) and id = 1"
 }
 
 # double in clause
@@ -710,7 +723,8 @@
   "TableName":"a",
   "FullQuery":"update a set name = 'foo' where eid in (1, 2) and id in (1, 2)",
   "OuterQuery":"update a set name = 'foo' where :#pk",
-  "Subquery":"select eid, id from a where eid in (1, 2) and id in (1, 2) limit :#maxLimit for update"
+  "Subquery":"select eid, id from a where eid in (1, 2) and id in (1, 2) limit :#maxLimit for update",
+  "WhereClause": " where eid in (1, 2) and id in (1, 2)"
 }
 
 # double use of pk
@@ -720,7 +734,8 @@
   "TableName":"a",
   "FullQuery":"update a set name = 'foo' where eid = 1 and eid = 2",
   "OuterQuery":"update a set name = 'foo' where :#pk",
-  "Subquery":"select eid, id from a where eid = 1 and eid = 2 limit :#maxLimit for update"
+  "Subquery":"select eid, id from a where eid = 1 and eid = 2 limit :#maxLimit for update",
+  "WhereClause": " where eid = 1 and eid = 2"
 }
 
 # delete cross-db
@@ -739,7 +754,8 @@
   "TableName": "a",
   "FullQuery": "delete from a",
   "OuterQuery": "delete from a where :#pk",
-  "Subquery": "select eid, id from a limit :#maxLimit for update"
+  "Subquery": "select eid, id from a limit :#maxLimit for update",
+  "WhereClause": ""
 }
 
 # delete complex where clause
@@ -749,7 +765,8 @@
   "TableName": "a",
   "FullQuery": "delete from a where eid + 1 = 1",
   "OuterQuery": "delete from a where :#pk",
-  "Subquery": "select eid, id from a where eid + 1 = 1 limit :#maxLimit for update"
+  "Subquery": "select eid, id from a where eid + 1 = 1 limit :#maxLimit for update",
+  "WhereClause": " where eid + 1 = 1"
 }
 
 # pk
@@ -759,7 +776,8 @@
   "TableName": "a",
   "FullQuery": "delete from a where eid = 1 and id = 1",
   "OuterQuery": "delete from a where :#pk",
-  "PKValues": [1, 1]
+  "PKValues": [1, 1],
+  "WhereClause": " where eid = 1 and id = 1"
 }
 
 # partial pk
@@ -769,7 +787,8 @@
   "TableName": "a",
   "FullQuery": "delete from a where eid = 1",
   "OuterQuery": "delete from a where :#pk",
-  "Subquery": "select eid, id from a where eid = 1 limit :#maxLimit for update"
+  "Subquery": "select eid, id from a where eid = 1 limit :#maxLimit for update",
+  "WhereClause": " where eid = 1"
 }
 
 # bad pk value delete
@@ -779,7 +798,8 @@
   "TableName": "a",
   "FullQuery": "delete from a where eid = 1.0 and id = 1",
   "OuterQuery": "delete from a where :#pk",
-  "Subquery": "select eid, id from a where eid = 1.0 and id = 1 limit :#maxLimit for update"
+  "Subquery": "select eid, id from a where eid = 1.0 and id = 1 limit :#maxLimit for update",
+  "WhereClause": " where eid = 1.0 and id = 1"
 }
 
 # non-pk
@@ -789,7 +809,8 @@
   "TableName": "a",
   "FullQuery": "delete from a where eid = 1 and name = 'foo'",
   "OuterQuery": "delete from a where :#pk",
-  "Subquery": "select eid, id from a where eid = 1 and name = 'foo' limit :#maxLimit for update"
+  "Subquery": "select eid, id from a where eid = 1 and name = 'foo' limit :#maxLimit for update",
+  "WhereClause": " where eid = 1 and name = 'foo'"
 }
 
 # no index
@@ -798,7 +819,8 @@
   "PlanID": "PASS_DML",
   "Reason": "TABLE_NOINDEX",
   "TableName": "c",
-  "FullQuery": "delete from c"
+  "FullQuery": "delete from c",
+  "WhereClause": ""
 }
 
 # delete complex expression in where
@@ -808,7 +830,8 @@
   "TableName":"a",
   "FullQuery":"delete from a where eid + 1 = 1 and id = 1",
   "OuterQuery":"delete from a where :#pk",
-  "Subquery":"select eid, id from a where eid + 1 = 1 and id = 1 limit :#maxLimit for update"
+  "Subquery":"select eid, id from a where eid + 1 = 1 and id = 1 limit :#maxLimit for update",
+  "WhereClause": " where eid + 1 = 1 and id = 1"
 }
 
 # parenthesized expressions in where
@@ -818,7 +841,8 @@
   "TableName": "a",
   "FullQuery": "delete from a where (eid = 1) and id = 1",
   "OuterQuery": "delete from a where :#pk",
-  "PKValues": [1, 1]
+  "PKValues": [1, 1],
+  "WhereClause": " where (eid = 1) and id = 1"
 }
 
 # delete in clause expression in where
@@ -828,7 +852,8 @@
   "TableName":"a",
   "FullQuery":"delete from a where eid in (1, 2) and id = 1",
   "OuterQuery":"delete from a where :#pk",
-  "PKValues":[[1,2],1]
+  "PKValues":[[1,2],1],
+  "WhereClause": " where eid in (1, 2) and id = 1"
 }
 
 # delete double in clause
@@ -838,7 +863,8 @@
   "TableName":"a",
   "FullQuery":"delete from a where eid in (1, 2) and id in (1, 2)",
   "OuterQuery":"delete from a where :#pk",
-  "Subquery":"select eid, id from a where eid in (1, 2) and id in (1, 2) limit :#maxLimit for update"
+  "Subquery":"select eid, id from a where eid in (1, 2) and id in (1, 2) limit :#maxLimit for update",
+  "WhereClause": " where eid in (1, 2) and id in (1, 2)"
 }
 
 # delete double use of pk
@@ -848,7 +874,8 @@
   "TableName":"a",
   "FullQuery":"delete from a where eid = 1 and eid = 2",
   "OuterQuery":"delete from a where :#pk",
-  "Subquery":"select eid, id from a where eid = 1 and eid = 2 limit :#maxLimit for update"
+  "Subquery":"select eid, id from a where eid = 1 and eid = 2 limit :#maxLimit for update",
+  "WhereClause": " where eid = 1 and eid = 2"
 }
 
 # single value sequence

data/test/vtgate/show_cases.txt

@@ -0,0 +1,53 @@
+# unsupported show
+"show create database"
+"unsupported show statement"
+
+# show databases
+"show databases"
+{
+  "Original": "show databases",
+  "Instructions": {
+    "Opcode": "Metadata",
+    "Query": "show databases"
+    }
+}
+
+# show tables
+"show tables"
+{
+  "Original": "show tables",
+  "Instructions": {
+    "Opcode": "Metadata",
+    "Query": "show tables"
+  }
+}
+
+# show vitess_keyspaces
+"show vitess_keyspaces"
+{
+  "Original": "show vitess_keyspaces",
+  "Instructions": {
+    "Opcode": "Metadata",
+    "Query": "show vitess_keyspaces"
+    }
+}
+
+# show vitess_shards
+"show vitess_shards"
+{
+  "Original": "show vitess_shards",
+  "Instructions": {
+    "Opcode": "Metadata",
+    "Query": "show vitess_shards"
+  }
+}
+
+# show vschema_tables
+"show vschema_tables"
+{
+  "Original": "show vschema_tables",
+  "Instructions": {
+    "Opcode": "Metadata",
+    "Query": "show vschema_tables"
+  }
+}