Slack sync upstream 2018 02 14

data/test/tabletserver/stream_cases.txt

@@ -3,6 +3,7 @@
 {
   "PlanID": "SELECT_STREAM",
   "TableName": "a",
+  "Permissions":[{"TableName":"a","Role":0}],
   "FullQuery": "select * from a"
 }
 
@@ -11,6 +12,7 @@
 {
   "PlanID": "SELECT_STREAM",
   "TableName": "",
+  "Permissions":[{"TableName":"a","Role":0},{"TableName":"b","Role":0}],
   "FullQuery": "select * from a join b"
 }
 
@@ -23,6 +25,7 @@
 {
   "PlanID": "SELECT_STREAM",
   "TableName": "",
+  "Permissions":[{"TableName":"a","Role":0},{"TableName":"b","Role":0}],
   "FullQuery": "select * from a union select * from b"
 }
 

data/test/vtgate/dml_cases.txt

@@ -200,6 +200,10 @@
   }
 }
 
+# update by primary keyspace id, changing same vindex twice
+"update user_metadata set email = 'a', email = 'b' where user_id = 1"
+"column has duplicate set values: 'email'"
+
 # update by primary keyspace id, changing multiple vindex columns
 "update user_metadata set email = 'juan@vitess.io', address = '155 5th street' where user_id = 1"
 {
@@ -1194,3 +1198,91 @@
     "Subquery": "select column_a, column_b, column_c from multicolvin where kid = 1 for update"
   }
 }
+
+# delete from with no where clause
+"delete from user_extra"
+{
+  "Original": "delete from user_extra",
+  "Instructions": {
+    "Opcode": "DeleteSharded",
+    "Keyspace": {
+      "Name": "user",
+      "Sharded": true
+    },
+    "Query": "delete from user_extra",
+    "Table": "user_extra"
+  }
+}
+
+# delete with non-comparison expr
+"delete from user_extra where user_id between 1 and 2"
+{
+  "Original": "delete from user_extra where user_id between 1 and 2",
+  "Instructions": {
+    "Opcode": "DeleteSharded",
+    "Keyspace": {
+      "Name": "user",
+      "Sharded": true
+    },
+    "Query": "delete from user_extra where user_id between 1 and 2",
+    "Table": "user_extra"
+  }
+}
+
+# delete from with no index match
+"delete from user_extra where name = 'jose'"
+{
+  "Original": "delete from user_extra where name = 'jose'",
+  "Instructions": {
+    "Opcode": "DeleteSharded",
+    "Keyspace": {
+      "Name": "user",
+      "Sharded": true
+    },
+    "Query": "delete from user_extra where name = 'jose'",
+    "Table": "user_extra"
+  }
+}
+
+# delete from with primary id in through IN clause
+"delete from user_extra where user_id in (1, 2)"
+{
+  "Original": "delete from user_extra where user_id in (1, 2)",
+  "Instructions": {
+    "Opcode": "DeleteSharded",
+    "Keyspace": {
+      "Name": "user",
+      "Sharded": true
+    },
+    "Query": "delete from user_extra where user_id in (1, 2)",
+    "Table": "user_extra"
+  }
+}
+
+# unsharded update where inner query references outer query
+"update unsharded set col = (select id from unsharded_a where id = unsharded.col) where col = (select id from unsharded_b)"
+{
+  "Original": "update unsharded set col = (select id from unsharded_a where id = unsharded.col) where col = (select id from unsharded_b)",
+  "Instructions": {
+    "Opcode": "UpdateUnsharded",
+    "Keyspace": {
+      "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)"
+  }
+}
+
+# unsharded delete where inner query references outer query
+"delete from unsharded where col = (select id from unsharded_a where id = unsharded.col)"
+{
+  "Original": "delete from unsharded where col = (select id from unsharded_a where id = unsharded.col)",
+  "Instructions": {
+    "Opcode": "DeleteUnsharded",
+    "Keyspace": {
+      "Name": "main",
+      "Sharded": false
+    },
+    "Query": "delete from unsharded where col = (select id from unsharded_a where id = unsharded.col)"
+  }
+}

data/test/vtgate/unsupported_cases.txt

@@ -239,6 +239,10 @@
 "delete from unsharded where col = (select id from user)"
 "unsupported: sharded subqueries in DML"
 
+# sharded delete with limit clasue
+"delete from user_extra limit 10"
+"unsupported: multi shard delete with limit"
+
 # sharded subquery in unsharded subquery in unsharded delete
 "delete from unsharded where col = (select id from unsharded where id = (select id from user))"
 "unsupported: sharded subqueries in DML"
@@ -251,50 +255,26 @@
 "update user set val = 1"
 "unsupported: multi-shard where clause in DML"
 
-# delete from with no where clause
-"delete from user"
-"unsupported: multi-shard where clause in DML"
-
 # update with non-comparison expr
 "update user set val = 1 where id between 1 and 2"
 "unsupported: multi-shard where clause in DML"
 
-# delete with non-comparison expr
-"delete from user where id between 1 and 2"
-"unsupported: multi-shard where clause in DML"
-
 # update with primary id through IN clause
 "update user set val = 1 where id in (1, 2)"
 "unsupported: multi-shard where clause in DML"
 
-# delete from with primary id through IN clause
-"delete from user where id in (1, 2)"
-"unsupported: multi-shard where clause in DML"
-
 # update with non-unique key
 "update user set val = 1 where name = 'foo'"
 "unsupported: multi-shard where clause in DML"
 
-# delete from with primary id through IN clause
-"delete from user where name = 'foo'"
-"unsupported: multi-shard where clause in DML"
-
 # update with no index match
 "update user set val = 1 where user_id = 1"
 "unsupported: multi-shard where clause in DML"
 
-# delete from with no index match
-"delete from user where user_id = 1"
-"unsupported: multi-shard where clause in DML"
-
 # update by lookup with IN clause
 "update music set val = 1 where id in (1, 2)"
 "unsupported: multi-shard where clause in DML"
 
-# delete from by lookup with IN clause
-"delete from music where id in (1, 2)"
-"unsupported: multi-shard where clause in DML"
-
 # delete with multi-table targets
 "delete music from music where id = 1"
 "unsupported: multi-table delete statement in sharded keyspace"
@@ -303,6 +283,10 @@
 "delete user from user join user_extra on user.id = user_extra.id where user.name = 'foo'"
 "unsupported: multi-table delete statement in sharded keyspace"
 
+# delete from table with no where clause and owned lookup vindex
+"delete from user"
+"unsupported: multi shard delete on a table with owned lookup vindexes"
+
 # update changes primary vindex column
 "update user set id = 1 where id = 1"
 "unsupported: You can't update primary vindex columns. Invalid update on vindex: user_index"

data/test/vtgate/vindex_func_cases.txt

@@ -1,4 +1,39 @@
-# vindex func read
+# vindex func read all cols
+"select id, keyspace_id, range_start, range_end from user_index where id = :id"
+{
+  "Original": "select id, keyspace_id, range_start, range_end from user_index where id = :id",
+  "Instructions": {
+    "Opcode": "VindexMap",
+    "Fields": [
+      {
+        "name": "id",
+        "type": 10262
+      },
+      {
+        "name": "keyspace_id",
+        "type": 10262
+      },
+      {
+        "name": "range_start",
+        "type": 10262
+      },
+      {
+        "name": "range_end",
+        "type": 10262
+      }
+    ],
+    "Cols": [
+      0,
+      1,
+      2,
+      3
+    ],
+    "Vindex": "user_index",
+    "Value": ":id"
+  }
+}
+
+# vindex func read with id repeated
 "select id, keyspace_id, id from user_index where id = :id"
 {
   "Original": "select id, keyspace_id, id from user_index where id = :id",

docker/k8s/vtctlclient/Dockerfile

@@ -1,4 +1,10 @@
 FROM vitess/base AS base
 FROM debian:stretch-slim
 COPY --from=base /vt/bin/vtctlclient /usr/bin/
+RUN apt-get update && \
+    apt-get upgrade -qq && \
+    apt-get install jq -qq --no-install-recommends && \
+    apt-get autoremove && \
+    apt-get clean && \
+    rm -rf /var/lib/apt/lists/*
 CMD ["/usr/bin/vtctlclient"]