diff --git a/.github/workflows/cluster_endtoend_onlineddl_vrepl.yml b/.github/workflows/cluster_endtoend_onlineddl_vrepl.yml
index 5056e46d895..ce0ba65f74f 100644
--- a/.github/workflows/cluster_endtoend_onlineddl_vrepl.yml
+++ b/.github/workflows/cluster_endtoend_onlineddl_vrepl.yml
@@ -149,6 +149,10 @@ jobs:
binlog-transaction-compression=ON
EOF
+ cat <<-EOF>>./config/mycnf/mysql8026.cnf
+ binlog-row-value-options=PARTIAL_JSON
+ EOF
+
# run the tests however you normally do, then produce a JUnit XML file
eatmydata -- go run test.go -docker=false -follow -shard onlineddl_vrepl | tee -a output.txt | go-junit-report -set-exit-code > report.xml
diff --git a/.github/workflows/cluster_endtoend_onlineddl_vrepl_stress.yml b/.github/workflows/cluster_endtoend_onlineddl_vrepl_stress.yml
index 3597b37ede7..57413f649e1 100644
--- a/.github/workflows/cluster_endtoend_onlineddl_vrepl_stress.yml
+++ b/.github/workflows/cluster_endtoend_onlineddl_vrepl_stress.yml
@@ -149,6 +149,10 @@ jobs:
binlog-transaction-compression=ON
EOF
+ cat <<-EOF>>./config/mycnf/mysql8026.cnf
+ binlog-row-value-options=PARTIAL_JSON
+ EOF
+
# run the tests however you normally do, then produce a JUnit XML file
eatmydata -- go run test.go -docker=false -follow -shard onlineddl_vrepl_stress | tee -a output.txt | go-junit-report -set-exit-code > report.xml
diff --git a/.github/workflows/cluster_endtoend_onlineddl_vrepl_stress_suite.yml b/.github/workflows/cluster_endtoend_onlineddl_vrepl_stress_suite.yml
index a5322578981..e1f949df6f8 100644
--- a/.github/workflows/cluster_endtoend_onlineddl_vrepl_stress_suite.yml
+++ b/.github/workflows/cluster_endtoend_onlineddl_vrepl_stress_suite.yml
@@ -149,6 +149,10 @@ jobs:
binlog-transaction-compression=ON
EOF
+ cat <<-EOF>>./config/mycnf/mysql8026.cnf
+ binlog-row-value-options=PARTIAL_JSON
+ EOF
+
# run the tests however you normally do, then produce a JUnit XML file
eatmydata -- go run test.go -docker=false -follow -shard onlineddl_vrepl_stress_suite | tee -a output.txt | go-junit-report -set-exit-code > report.xml
diff --git a/.github/workflows/cluster_endtoend_onlineddl_vrepl_suite.yml b/.github/workflows/cluster_endtoend_onlineddl_vrepl_suite.yml
index 12bde509048..18090dd2430 100644
--- a/.github/workflows/cluster_endtoend_onlineddl_vrepl_suite.yml
+++ b/.github/workflows/cluster_endtoend_onlineddl_vrepl_suite.yml
@@ -149,6 +149,10 @@ jobs:
binlog-transaction-compression=ON
EOF
+ cat <<-EOF>>./config/mycnf/mysql8026.cnf
+ binlog-row-value-options=PARTIAL_JSON
+ EOF
+
# run the tests however you normally do, then produce a JUnit XML file
eatmydata -- go run test.go -docker=false -follow -shard onlineddl_vrepl_suite | tee -a output.txt | go-junit-report -set-exit-code > report.xml
diff --git a/.github/workflows/cluster_endtoend_schemadiff_vrepl.yml b/.github/workflows/cluster_endtoend_schemadiff_vrepl.yml
index e452d28606a..2053a75db4c 100644
--- a/.github/workflows/cluster_endtoend_schemadiff_vrepl.yml
+++ b/.github/workflows/cluster_endtoend_schemadiff_vrepl.yml
@@ -149,6 +149,10 @@ jobs:
binlog-transaction-compression=ON
EOF
+ cat <<-EOF>>./config/mycnf/mysql8026.cnf
+ binlog-row-value-options=PARTIAL_JSON
+ EOF
+
# run the tests however you normally do, then produce a JUnit XML file
eatmydata -- go run test.go -docker=false -follow -shard schemadiff_vrepl | tee -a output.txt | go-junit-report -set-exit-code > report.xml
diff --git a/.github/workflows/cluster_endtoend_vreplication_across_db_versions.yml b/.github/workflows/cluster_endtoend_vreplication_across_db_versions.yml
index a38506ddd7d..6f502c94d32 100644
--- a/.github/workflows/cluster_endtoend_vreplication_across_db_versions.yml
+++ b/.github/workflows/cluster_endtoend_vreplication_across_db_versions.yml
@@ -166,6 +166,10 @@ jobs:
binlog-transaction-compression=ON
EOF
+ cat <<-EOF>>./config/mycnf/mysql8026.cnf
+ binlog-row-value-options=PARTIAL_JSON
+ EOF
+
# run the tests however you normally do, then produce a JUnit XML file
eatmydata -- go run test.go -docker=false -follow -shard vreplication_across_db_versions | tee -a output.txt | go-junit-report -set-exit-code > report.xml
diff --git a/.github/workflows/cluster_endtoend_vreplication_basic.yml b/.github/workflows/cluster_endtoend_vreplication_basic.yml
index 283d0451a34..120cf541305 100644
--- a/.github/workflows/cluster_endtoend_vreplication_basic.yml
+++ b/.github/workflows/cluster_endtoend_vreplication_basic.yml
@@ -166,6 +166,10 @@ jobs:
binlog-transaction-compression=ON
EOF
+ cat <<-EOF>>./config/mycnf/mysql8026.cnf
+ binlog-row-value-options=PARTIAL_JSON
+ EOF
+
# run the tests however you normally do, then produce a JUnit XML file
eatmydata -- go run test.go -docker=false -follow -shard vreplication_basic | tee -a output.txt | go-junit-report -set-exit-code > report.xml
diff --git a/.github/workflows/cluster_endtoend_vreplication_cellalias.yml b/.github/workflows/cluster_endtoend_vreplication_cellalias.yml
index b316c075614..760912b4818 100644
--- a/.github/workflows/cluster_endtoend_vreplication_cellalias.yml
+++ b/.github/workflows/cluster_endtoend_vreplication_cellalias.yml
@@ -166,6 +166,10 @@ jobs:
binlog-transaction-compression=ON
EOF
+ cat <<-EOF>>./config/mycnf/mysql8026.cnf
+ binlog-row-value-options=PARTIAL_JSON
+ EOF
+
# run the tests however you normally do, then produce a JUnit XML file
eatmydata -- go run test.go -docker=false -follow -shard vreplication_cellalias | tee -a output.txt | go-junit-report -set-exit-code > report.xml
diff --git a/.github/workflows/cluster_endtoend_vreplication_copy_parallel.yml b/.github/workflows/cluster_endtoend_vreplication_copy_parallel.yml
index 48f506709e7..d944a253ce3 100644
--- a/.github/workflows/cluster_endtoend_vreplication_copy_parallel.yml
+++ b/.github/workflows/cluster_endtoend_vreplication_copy_parallel.yml
@@ -166,6 +166,10 @@ jobs:
binlog-transaction-compression=ON
EOF
+ cat <<-EOF>>./config/mycnf/mysql8026.cnf
+ binlog-row-value-options=PARTIAL_JSON
+ EOF
+
# run the tests however you normally do, then produce a JUnit XML file
eatmydata -- go run test.go -docker=false -follow -shard vreplication_copy_parallel | tee -a output.txt | go-junit-report -set-exit-code > report.xml
diff --git a/.github/workflows/cluster_endtoend_vreplication_foreign_key_stress.yml b/.github/workflows/cluster_endtoend_vreplication_foreign_key_stress.yml
index a1293e3688e..5bba7760d7e 100644
--- a/.github/workflows/cluster_endtoend_vreplication_foreign_key_stress.yml
+++ b/.github/workflows/cluster_endtoend_vreplication_foreign_key_stress.yml
@@ -166,6 +166,10 @@ jobs:
binlog-transaction-compression=ON
EOF
+ cat <<-EOF>>./config/mycnf/mysql8026.cnf
+ binlog-row-value-options=PARTIAL_JSON
+ EOF
+
# run the tests however you normally do, then produce a JUnit XML file
eatmydata -- go run test.go -docker=false -follow -shard vreplication_foreign_key_stress | tee -a output.txt | go-junit-report -set-exit-code > report.xml
diff --git a/.github/workflows/cluster_endtoend_vreplication_mariadb_to_mysql.yml b/.github/workflows/cluster_endtoend_vreplication_mariadb_to_mysql.yml
index 2013d89a83d..1184fe493ef 100644
--- a/.github/workflows/cluster_endtoend_vreplication_mariadb_to_mysql.yml
+++ b/.github/workflows/cluster_endtoend_vreplication_mariadb_to_mysql.yml
@@ -166,6 +166,10 @@ jobs:
binlog-transaction-compression=ON
EOF
+ cat <<-EOF>>./config/mycnf/mysql8026.cnf
+ binlog-row-value-options=PARTIAL_JSON
+ EOF
+
# run the tests however you normally do, then produce a JUnit XML file
eatmydata -- go run test.go -docker=false -follow -shard vreplication_mariadb_to_mysql | tee -a output.txt | go-junit-report -set-exit-code > report.xml
diff --git a/.github/workflows/cluster_endtoend_vreplication_migrate.yml b/.github/workflows/cluster_endtoend_vreplication_migrate.yml
index e7a8a8cb5ce..009840800d2 100644
--- a/.github/workflows/cluster_endtoend_vreplication_migrate.yml
+++ b/.github/workflows/cluster_endtoend_vreplication_migrate.yml
@@ -166,6 +166,10 @@ jobs:
binlog-transaction-compression=ON
EOF
+ cat <<-EOF>>./config/mycnf/mysql8026.cnf
+ binlog-row-value-options=PARTIAL_JSON
+ EOF
+
# run the tests however you normally do, then produce a JUnit XML file
eatmydata -- go run test.go -docker=false -follow -shard vreplication_migrate | tee -a output.txt | go-junit-report -set-exit-code > report.xml
diff --git a/.github/workflows/cluster_endtoend_vreplication_multi_tenant.yml b/.github/workflows/cluster_endtoend_vreplication_multi_tenant.yml
index c0c80a8dc61..9a5935a8907 100644
--- a/.github/workflows/cluster_endtoend_vreplication_multi_tenant.yml
+++ b/.github/workflows/cluster_endtoend_vreplication_multi_tenant.yml
@@ -166,6 +166,10 @@ jobs:
binlog-transaction-compression=ON
EOF
+ cat <<-EOF>>./config/mycnf/mysql8026.cnf
+ binlog-row-value-options=PARTIAL_JSON
+ EOF
+
# run the tests however you normally do, then produce a JUnit XML file
eatmydata -- go run test.go -docker=false -follow -shard vreplication_multi_tenant | tee -a output.txt | go-junit-report -set-exit-code > report.xml
diff --git a/.github/workflows/cluster_endtoend_vreplication_partial_movetables_and_materialize.yml b/.github/workflows/cluster_endtoend_vreplication_partial_movetables_and_materialize.yml
index 0b80b82fd7f..0a10e37e6c4 100644
--- a/.github/workflows/cluster_endtoend_vreplication_partial_movetables_and_materialize.yml
+++ b/.github/workflows/cluster_endtoend_vreplication_partial_movetables_and_materialize.yml
@@ -166,6 +166,10 @@ jobs:
binlog-transaction-compression=ON
EOF
+ cat <<-EOF>>./config/mycnf/mysql8026.cnf
+ binlog-row-value-options=PARTIAL_JSON
+ EOF
+
# run the tests however you normally do, then produce a JUnit XML file
eatmydata -- go run test.go -docker=false -follow -shard vreplication_partial_movetables_and_materialize | tee -a output.txt | go-junit-report -set-exit-code > report.xml
diff --git a/.github/workflows/cluster_endtoend_vreplication_v2.yml b/.github/workflows/cluster_endtoend_vreplication_v2.yml
index fcbe7057b4c..f023bf9718b 100644
--- a/.github/workflows/cluster_endtoend_vreplication_v2.yml
+++ b/.github/workflows/cluster_endtoend_vreplication_v2.yml
@@ -166,6 +166,10 @@ jobs:
binlog-transaction-compression=ON
EOF
+ cat <<-EOF>>./config/mycnf/mysql8026.cnf
+ binlog-row-value-options=PARTIAL_JSON
+ EOF
+
# run the tests however you normally do, then produce a JUnit XML file
eatmydata -- go run test.go -docker=false -follow -shard vreplication_v2 | tee -a output.txt | go-junit-report -set-exit-code > report.xml
diff --git a/.github/workflows/cluster_endtoend_vreplication_vtctldclient_vdiff2_movetables_tz.yml b/.github/workflows/cluster_endtoend_vreplication_vtctldclient_vdiff2_movetables_tz.yml
index 40f2002f9a3..7d96ac60306 100644
--- a/.github/workflows/cluster_endtoend_vreplication_vtctldclient_vdiff2_movetables_tz.yml
+++ b/.github/workflows/cluster_endtoend_vreplication_vtctldclient_vdiff2_movetables_tz.yml
@@ -166,6 +166,10 @@ jobs:
binlog-transaction-compression=ON
EOF
+ cat <<-EOF>>./config/mycnf/mysql8026.cnf
+ binlog-row-value-options=PARTIAL_JSON
+ EOF
+
# run the tests however you normally do, then produce a JUnit XML file
eatmydata -- go run test.go -docker=false -follow -shard vreplication_vtctldclient_vdiff2_movetables_tz | tee -a output.txt | go-junit-report -set-exit-code > report.xml
diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml
index fc30974212b..c971466b998 100644
--- a/.github/workflows/codecov.yml
+++ b/.github/workflows/codecov.yml
@@ -111,7 +111,7 @@ jobs:
- name: Upload coverage reports to codecov.io
if: steps.changes.outputs.changed_files == 'true'
- uses: codecov/codecov-action@v4
+ uses: codecov/codecov-action@015f24e6818733317a2da2edd6290ab26238649a # https://github.com/codecov/codecov-action/releases/tag/v5.0.7
with:
fail_ci_if_error: true
verbose: true
diff --git a/.github/workflows/unit_test_evalengine_mysql57.yml b/.github/workflows/unit_test_evalengine_mysql57.yml
index ecc366b38fe..d55b2732c86 100644
--- a/.github/workflows/unit_test_evalengine_mysql57.yml
+++ b/.github/workflows/unit_test_evalengine_mysql57.yml
@@ -163,6 +163,9 @@ jobs:
export NOVTADMINBUILD=1
export VTEVALENGINETEST="1"
+ # We sometimes need to alter the behavior based on the platform we're
+ # testing, e.g. MySQL 5.7 vs 8.0.
+ export CI_DB_PLATFORM="mysql57"
eatmydata -- make unit_test | tee -a output.txt | go-junit-report -set-exit-code > report.xml
diff --git a/.github/workflows/unit_test_evalengine_mysql80.yml b/.github/workflows/unit_test_evalengine_mysql80.yml
index e6e802b52d8..96af579742e 100644
--- a/.github/workflows/unit_test_evalengine_mysql80.yml
+++ b/.github/workflows/unit_test_evalengine_mysql80.yml
@@ -153,6 +153,9 @@ jobs:
export NOVTADMINBUILD=1
export VTEVALENGINETEST="1"
+ # We sometimes need to alter the behavior based on the platform we're
+ # testing, e.g. MySQL 5.7 vs 8.0.
+ export CI_DB_PLATFORM="mysql80"
eatmydata -- make unit_test | tee -a output.txt | go-junit-report -set-exit-code > report.xml
diff --git a/.github/workflows/unit_test_evalengine_mysql84.yml b/.github/workflows/unit_test_evalengine_mysql84.yml
index 46736dac349..efbe2b0eb9f 100644
--- a/.github/workflows/unit_test_evalengine_mysql84.yml
+++ b/.github/workflows/unit_test_evalengine_mysql84.yml
@@ -153,6 +153,9 @@ jobs:
export NOVTADMINBUILD=1
export VTEVALENGINETEST="1"
+ # We sometimes need to alter the behavior based on the platform we're
+ # testing, e.g. MySQL 5.7 vs 8.0.
+ export CI_DB_PLATFORM="mysql84"
eatmydata -- make unit_test | tee -a output.txt | go-junit-report -set-exit-code > report.xml
diff --git a/.github/workflows/unit_test_mysql57.yml b/.github/workflows/unit_test_mysql57.yml
index 3eaf02d1538..eed08e9ce4c 100644
--- a/.github/workflows/unit_test_mysql57.yml
+++ b/.github/workflows/unit_test_mysql57.yml
@@ -163,6 +163,9 @@ jobs:
export NOVTADMINBUILD=1
export VTEVALENGINETEST="0"
+ # We sometimes need to alter the behavior based on the platform we're
+ # testing, e.g. MySQL 5.7 vs 8.0.
+ export CI_DB_PLATFORM="mysql57"
eatmydata -- make unit_test | tee -a output.txt | go-junit-report -set-exit-code > report.xml
diff --git a/.github/workflows/unit_test_mysql80.yml b/.github/workflows/unit_test_mysql80.yml
index c036e6dd477..9e0ed7e6977 100644
--- a/.github/workflows/unit_test_mysql80.yml
+++ b/.github/workflows/unit_test_mysql80.yml
@@ -153,6 +153,9 @@ jobs:
export NOVTADMINBUILD=1
export VTEVALENGINETEST="0"
+ # We sometimes need to alter the behavior based on the platform we're
+ # testing, e.g. MySQL 5.7 vs 8.0.
+ export CI_DB_PLATFORM="mysql80"
eatmydata -- make unit_test | tee -a output.txt | go-junit-report -set-exit-code > report.xml
diff --git a/.github/workflows/unit_test_mysql84.yml b/.github/workflows/unit_test_mysql84.yml
index 84447ce390b..5948eb0836a 100644
--- a/.github/workflows/unit_test_mysql84.yml
+++ b/.github/workflows/unit_test_mysql84.yml
@@ -153,6 +153,9 @@ jobs:
export NOVTADMINBUILD=1
export VTEVALENGINETEST="0"
+ # We sometimes need to alter the behavior based on the platform we're
+ # testing, e.g. MySQL 5.7 vs 8.0.
+ export CI_DB_PLATFORM="mysql84"
eatmydata -- make unit_test | tee -a output.txt | go-junit-report -set-exit-code > report.xml
diff --git a/changelog/22.0/22.0.0/summary.md b/changelog/22.0/22.0.0/summary.md
index cb8372cd60e..3f63b2d868f 100644
--- a/changelog/22.0/22.0.0/summary.md
+++ b/changelog/22.0/22.0.0/summary.md
@@ -8,6 +8,7 @@
- **[RPC Changes](#rpc-changes)**
- **[Prefer not promoting a replica that is currently taking a backup](#reparents-prefer-not-backing-up)**
- **[VTOrc Config File Changes](#vtorc-config-file-changes)**
+ - **[Support for More Efficient JSON Replication](#efficient-json-replication)**
- **[Minor Changes](#minor-changes)**
- **[VTTablet Flags](#flags-vttablet)**
- **[Topology read concurrency behaviour changes](#topo-read-concurrency-changes)**
@@ -59,6 +60,12 @@ The following fields can be dynamically changed -
To upgrade to the newer version of the configuration file, first switch to using the flags in your current deployment before upgrading. Then you can switch to using the configuration file in the newer release.
+### Support for More Efficient JSON Replication
+
+In [#7345](https://github.com/vitessio/vitess/pull/17345) we added support for [`--binlog-row-value-options=PARTIAL_JSON`](https://dev.mysql.com/doc/refman/en/replication-options-binary-log.html#sysvar_binlog_row_value_options). You can read more about [this feature added to MySQL 8.0 here](https://dev.mysql.com/blog-archive/efficient-json-replication-in-mysql-8-0/).
+
+If you are using MySQL 8.0 or later and using JSON columns, you can now enable this MySQL feature across your Vitess cluster(s) to lower the disk space needed for binary logs and improve the CPU and memory usage in both `mysqld` (standard intrashard MySQL replication) and `vttablet` ([VReplication](https://vitess.io/docs/reference/vreplication/vreplication/)) without losing any capabilities or features.
+
## Minor Changes
diff --git a/examples/operator/operator.yaml b/examples/operator/operator.yaml
index 4b1b64df1ac..ded85de5285 100644
--- a/examples/operator/operator.yaml
+++ b/examples/operator/operator.yaml
@@ -679,6 +679,9 @@ spec:
maxLength: 256
pattern: ^[^\r\n]*$
type: string
+ minPartSize:
+ format: int64
+ type: integer
region:
minLength: 1
type: string
@@ -1995,6 +1998,9 @@ spec:
maxLength: 256
pattern: ^[^\r\n]*$
type: string
+ minPartSize:
+ format: int64
+ type: integer
region:
minLength: 1
type: string
@@ -3510,6 +3516,14 @@ spec:
mysql80Compatible:
type: string
type: object
+ mysqldExporter:
+ type: string
+ vtbackup:
+ type: string
+ vtorc:
+ type: string
+ vttablet:
+ type: string
type: object
name:
maxLength: 63
@@ -5241,6 +5255,9 @@ spec:
maxLength: 256
pattern: ^[^\r\n]*$
type: string
+ minPartSize:
+ format: int64
+ type: integer
region:
minLength: 1
type: string
@@ -6688,6 +6705,9 @@ spec:
maxLength: 256
pattern: ^[^\r\n]*$
type: string
+ minPartSize:
+ format: int64
+ type: integer
region:
minLength: 1
type: string
diff --git a/go.mod b/go.mod
index 6fd800b80ab..603bc37c62e 100644
--- a/go.mod
+++ b/go.mod
@@ -68,7 +68,7 @@ require (
go.uber.org/mock v0.2.0
golang.org/x/crypto v0.31.0 // indirect
golang.org/x/mod v0.22.0 // indirect
- golang.org/x/net v0.31.0
+ golang.org/x/net v0.33.0
golang.org/x/oauth2 v0.24.0
golang.org/x/sys v0.28.0
golang.org/x/term v0.27.0
@@ -96,6 +96,7 @@ require (
github.com/aws/aws-sdk-go-v2/service/s3 v1.66.3
github.com/aws/smithy-go v1.22.0
github.com/bndr/gotabulate v1.1.2
+ github.com/dustin/go-humanize v1.0.1
github.com/gammazero/deque v0.2.1
github.com/google/safehtml v0.1.0
github.com/hashicorp/go-version v1.7.0
@@ -153,7 +154,6 @@ require (
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
github.com/cpuguy83/go-md2man/v2 v2.0.5 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
- github.com/dustin/go-humanize v1.0.1 // indirect
github.com/eapache/queue/v2 v2.0.0-20230407133247-75960ed334e4 // indirect
github.com/ebitengine/purego v0.8.1 // indirect
github.com/envoyproxy/go-control-plane v0.13.1 // indirect
diff --git a/go.sum b/go.sum
index 3a7c5e07599..faf1e24be13 100644
--- a/go.sum
+++ b/go.sum
@@ -660,8 +660,8 @@ golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v
golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
golang.org/x/net v0.0.0-20210410081132-afb366fc7cd1/go.mod h1:9tjilg8BloeKEkVJvy7fQ90B1CfIiPueXVOjqfkSzI8=
golang.org/x/net v0.0.0-20210610132358-84b48f89b13b/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.31.0 h1:68CPQngjLL0r2AlUKiSxtQFKvzRVbnzLwMUn5SzcLHo=
-golang.org/x/net v0.31.0/go.mod h1:P4fl1q7dY2hnZFxEk4pPSkDHF+QqjitcnDjUQyMM+pM=
+golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I=
+golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
golang.org/x/oauth2 v0.24.0 h1:KTBBxWqUa0ykRPLtV69rRto9TLXcqYkeswu48x/gvNE=
diff --git a/go/cmd/internal/docgen/docgen.go b/go/cmd/internal/docgen/docgen.go
index eea935ed396..f6c7e6b098d 100644
--- a/go/cmd/internal/docgen/docgen.go
+++ b/go/cmd/internal/docgen/docgen.go
@@ -116,7 +116,6 @@ func restructure(rootDir string, dir string, name string, commands []*cobra.Comm
fullCmdFilename := strings.Join([]string{name, cmd.Name()}, "_")
children := cmd.Commands()
-
switch {
case len(children) > 0:
// Command (top-level or not) with children.
@@ -151,7 +150,6 @@ func restructure(rootDir string, dir string, name string, commands []*cobra.Comm
oldName := filepath.Join(rootDir, fullCmdFilename+".md")
newName := filepath.Join(dir, fullCmdFilename+".md")
-
if err := os.Rename(oldName, newName); err != nil {
return fmt.Errorf("failed to move child command %s to its parent's dir: %w", fullCmdFilename, err)
}
@@ -166,6 +164,14 @@ func restructure(rootDir string, dir string, name string, commands []*cobra.Comm
}
default:
// Top-level command without children. Nothing to restructure.
+ // However we still need to anonymize the homedir in the help text.
+ if cmd.Name() == "help" {
+ // all commands with children have their own "help" subcommand,
+ // which we do not generate docs for
+ continue
+ }
+ f := filepath.Join(dir, fullCmdFilename+".md")
+ _ = anonymizeHomedir(f) // it is possible that the file does not exist, so we ignore the error
continue
}
}
@@ -190,11 +196,14 @@ func anonymizeHomedir(file string) (err error) {
if err != nil {
return err
}
+ if _, err := os.Stat(file); err != nil {
+ return nil
+ }
// We're replacing the stuff inside the square brackets in the example sed
// below:
// 's:Paths to search for config files in. (default \[.*\])$:Paths to search for config files in. (default \[\]):'
- sed := exec.Command("sed", "-i", "-e", fmt.Sprintf("s:%s::i", wd), file)
+ sed := exec.Command("sed", "-i", "", "-e", fmt.Sprintf("s:%s:%s:", wd, ""), file)
if out, err := sed.CombinedOutput(); err != nil {
return fmt.Errorf("%w: %s", err, out)
}
@@ -224,7 +233,6 @@ func getCommitID(ref string) (string, error) {
const frontmatter = `---
title: %s
series: %s
-commit: %s
---
`
@@ -240,7 +248,7 @@ func frontmatterFilePrepender(sha string) func(filename string) string {
cmdName = strings.ReplaceAll(cmdName, "_", " ")
- return fmt.Sprintf(frontmatter, cmdName, root, sha)
+ return fmt.Sprintf(frontmatter, cmdName, root)
}
}
diff --git a/go/cmd/internal/docgen/docgen_test.go b/go/cmd/internal/docgen/docgen_test.go
index 2370727cde5..741f5ecc577 100644
--- a/go/cmd/internal/docgen/docgen_test.go
+++ b/go/cmd/internal/docgen/docgen_test.go
@@ -41,7 +41,7 @@ func TestGenerateMarkdownTree(t *testing.T) {
name: "current dir",
dir: "./",
cmd: &cobra.Command{},
- expectErr: false,
+ expectErr: true,
},
{
name: "Permission denied",
diff --git a/go/cmd/vtctldclient/command/vreplication/vdiff/vdiff.go b/go/cmd/vtctldclient/command/vreplication/vdiff/vdiff.go
index 54b2eec0840..38b0521f142 100644
--- a/go/cmd/vtctldclient/command/vreplication/vdiff/vdiff.go
+++ b/go/cmd/vtctldclient/command/vreplication/vdiff/vdiff.go
@@ -17,13 +17,11 @@ limitations under the License.
package vdiff
import (
- "encoding/json"
"fmt"
"html/template"
"io"
"math"
"reflect"
- "sort"
"strings"
"time"
@@ -579,7 +577,7 @@ func buildRecentListings(resp *vtctldatapb.VDiffShowResponse) ([]*listing, error
func displayShowSingleSummary(out io.Writer, format, keyspace, workflowName, uuid string, resp *vtctldatapb.VDiffShowResponse, verbose bool) (vdiff.VDiffState, error) {
state := vdiff.UnknownState
var output string
- summary, err := buildSingleSummary(keyspace, workflowName, uuid, resp, verbose)
+ summary, err := workflow.BuildSummary(keyspace, workflowName, uuid, resp, verbose)
if err != nil {
return state, err
}
@@ -616,225 +614,6 @@ func displayShowSingleSummary(out io.Writer, format, keyspace, workflowName, uui
return state, nil
}
-func buildSingleSummary(keyspace, workflow, uuid string, resp *vtctldatapb.VDiffShowResponse, verbose bool) (*summary, error) {
- summary := &summary{
- Workflow: workflow,
- Keyspace: keyspace,
- UUID: uuid,
- State: vdiff.UnknownState,
- RowsCompared: 0,
- StartedAt: "",
- CompletedAt: "",
- HasMismatch: false,
- Shards: "",
- Reports: make(map[string]map[string]vdiff.DiffReport),
- Errors: make(map[string]string),
- Progress: nil,
- }
-
- var tableSummaryMap map[string]tableSummary
- var reports map[string]map[string]vdiff.DiffReport
- // Keep a tally of the states across all tables in all shards.
- tableStateCounts := map[vdiff.VDiffState]int{
- vdiff.UnknownState: 0,
- vdiff.PendingState: 0,
- vdiff.StartedState: 0,
- vdiff.StoppedState: 0,
- vdiff.ErrorState: 0,
- vdiff.CompletedState: 0,
- }
- // Keep a tally of the summary states across all shards.
- shardStateCounts := map[vdiff.VDiffState]int{
- vdiff.UnknownState: 0,
- vdiff.PendingState: 0,
- vdiff.StartedState: 0,
- vdiff.StoppedState: 0,
- vdiff.ErrorState: 0,
- vdiff.CompletedState: 0,
- }
- // Keep a tally of the approximate total rows to process as we'll use this for our progress
- // report.
- totalRowsToCompare := int64(0)
- var shards []string
- for shard, resp := range resp.TabletResponses {
- first := true
- if resp != nil && resp.Output != nil {
- shards = append(shards, shard)
- qr := sqltypes.Proto3ToResult(resp.Output)
- if tableSummaryMap == nil {
- tableSummaryMap = make(map[string]tableSummary, 0)
- reports = make(map[string]map[string]vdiff.DiffReport, 0)
- }
- for _, row := range qr.Named().Rows {
- // Update the global VDiff summary based on the per shard level summary.
- // Since these values will be the same for all subsequent rows we only use
- // the first row.
- if first {
- first = false
- // Our timestamps are strings in `2022-06-26 20:43:25` format so we sort
- // them lexicographically.
- // We should use the earliest started_at across all shards.
- if sa := row.AsString("started_at", ""); summary.StartedAt == "" || sa < summary.StartedAt {
- summary.StartedAt = sa
- }
- // And we should use the latest completed_at across all shards.
- if ca := row.AsString("completed_at", ""); summary.CompletedAt == "" || ca > summary.CompletedAt {
- summary.CompletedAt = ca
- }
- // If we had an error on the shard, then let's add that to the summary.
- if le := row.AsString("last_error", ""); le != "" {
- summary.Errors[shard] = le
- }
- // Keep track of how many shards are marked as a specific state. We check
- // this combined with the shard.table states to determine the VDiff summary
- // state.
- shardStateCounts[vdiff.VDiffState(strings.ToLower(row.AsString("vdiff_state", "")))]++
- }
-
- // Global VDiff summary updates that take into account the per table details
- // per shard.
- {
- summary.RowsCompared += row.AsInt64("rows_compared", 0)
- totalRowsToCompare += row.AsInt64("table_rows", 0)
-
- // If we had a mismatch on any table on any shard then the global VDiff
- // summary does too.
- if mm, _ := row.ToBool("has_mismatch"); mm {
- summary.HasMismatch = true
- }
- }
-
- // Table summary information that must be accounted for across all shards.
- {
- table := row.AsString("table_name", "")
- if table == "" { // This occurs when the table diff has not started on 1 or more shards
- continue
- }
- // Create the global VDiff table summary object if it doesn't exist.
- if _, ok := tableSummaryMap[table]; !ok {
- tableSummaryMap[table] = tableSummary{
- TableName: table,
- State: vdiff.UnknownState,
- }
-
- }
- ts := tableSummaryMap[table]
- // This is the shard level VDiff table state.
- sts := vdiff.VDiffState(strings.ToLower(row.AsString("table_state", "")))
- tableStateCounts[sts]++
-
- // The error state must be sticky, and we should not override any other
- // known state with completed.
- switch sts {
- case vdiff.CompletedState:
- if ts.State == vdiff.UnknownState {
- ts.State = sts
- }
- case vdiff.ErrorState:
- ts.State = sts
- default:
- if ts.State != vdiff.ErrorState {
- ts.State = sts
- }
- }
-
- diffReport := row.AsString("report", "")
- dr := vdiff.DiffReport{}
- if diffReport != "" {
- err := json.Unmarshal([]byte(diffReport), &dr)
- if err != nil {
- return nil, err
- }
- ts.RowsCompared += dr.ProcessedRows
- ts.MismatchedRows += dr.MismatchedRows
- ts.MatchingRows += dr.MatchingRows
- ts.ExtraRowsTarget += dr.ExtraRowsTarget
- ts.ExtraRowsSource += dr.ExtraRowsSource
- }
- if _, ok := reports[table]; !ok {
- reports[table] = make(map[string]vdiff.DiffReport)
- }
-
- reports[table][shard] = dr
- tableSummaryMap[table] = ts
- }
- }
- }
- }
-
- // The global VDiff summary should progress from pending->started->completed with
- // stopped for any shard and error for any table being sticky for the global summary.
- // We should only consider the VDiff to be complete if it's completed for every table
- // on every shard.
- if shardStateCounts[vdiff.StoppedState] > 0 {
- summary.State = vdiff.StoppedState
- } else if shardStateCounts[vdiff.ErrorState] > 0 || tableStateCounts[vdiff.ErrorState] > 0 {
- summary.State = vdiff.ErrorState
- } else if tableStateCounts[vdiff.StartedState] > 0 {
- summary.State = vdiff.StartedState
- } else if tableStateCounts[vdiff.PendingState] > 0 {
- summary.State = vdiff.PendingState
- } else if tableStateCounts[vdiff.CompletedState] == (len(tableSummaryMap) * len(shards)) {
- // When doing shard consolidations/merges, we cannot rely solely on the
- // vdiff_table state as there are N sources that we process rows from sequentially
- // with each one writing to the shared _vt.vdiff_table record for the target shard.
- // So we only mark the vdiff for the shard as completed when we've finished
- // processing rows from all of the sources -- which is recorded by marking the
- // vdiff done for the shard by setting _vt.vdiff.state = completed.
- if shardStateCounts[vdiff.CompletedState] == len(shards) {
- summary.State = vdiff.CompletedState
- } else {
- summary.State = vdiff.StartedState
- }
- } else {
- summary.State = vdiff.UnknownState
- }
-
- // If the vdiff has been started then we can calculate the progress.
- if summary.State == vdiff.StartedState {
- summary.Progress = BuildProgressReport(summary.RowsCompared, totalRowsToCompare, summary.StartedAt)
- }
-
- sort.Strings(shards) // Sort for predictable output
- summary.Shards = strings.Join(shards, ",")
- summary.TableSummaryMap = tableSummaryMap
- summary.Reports = reports
- if !summary.HasMismatch && !verbose {
- summary.Reports = nil
- summary.TableSummaryMap = nil
- }
- // If we haven't completed the global VDiff then be sure to reflect that with no
- // CompletedAt value.
- if summary.State != vdiff.CompletedState {
- summary.CompletedAt = ""
- }
- return summary, nil
-}
-
-func BuildProgressReport(rowsCompared int64, rowsToCompare int64, startedAt string) *vdiff.ProgressReport {
- report := &vdiff.ProgressReport{}
- if rowsCompared >= 1 {
- // Round to 2 decimal points.
- report.Percentage = math.Round(math.Min((float64(rowsCompared)/float64(rowsToCompare))*100, 100.00)*100) / 100
- }
- if math.IsNaN(report.Percentage) {
- report.Percentage = 0
- }
- pctToGo := math.Abs(report.Percentage - 100.00)
- startTime, _ := time.Parse(vdiff.TimestampFormat, startedAt)
- curTime := time.Now().UTC()
- runTime := curTime.Unix() - startTime.Unix()
- if report.Percentage >= 1 {
- // Calculate how long 1% took, on avg, and multiply that by the % left.
- eta := time.Unix(((int64(runTime)/int64(report.Percentage))*int64(pctToGo))+curTime.Unix(), 1).UTC()
- // Cap the ETA at 1 year out to prevent providing nonsensical ETAs.
- if eta.Before(time.Now().UTC().AddDate(1, 0, 0)) {
- report.ETA = eta.Format(vdiff.TimestampFormat)
- }
- }
- return report
-}
-
func commandShow(cmd *cobra.Command, args []string) error {
format, err := common.GetOutputFormat(cmd)
if err != nil {
diff --git a/go/cmd/vtctldclient/command/vreplication/vdiff/vdiff_test.go b/go/cmd/vtctldclient/command/vreplication/vdiff/vdiff_test.go
index 8fbff03433d..e27c57f47be 100644
--- a/go/cmd/vtctldclient/command/vreplication/vdiff/vdiff_test.go
+++ b/go/cmd/vtctldclient/command/vreplication/vdiff/vdiff_test.go
@@ -19,7 +19,6 @@ package vdiff
import (
"context"
"fmt"
- "math"
"testing"
"time"
@@ -690,112 +689,3 @@ func TestGetStructNames(t *testing.T) {
want := []string{"A", "B"}
require.EqualValues(t, want, got)
}
-
-func TestBuildProgressReport(t *testing.T) {
- now := time.Now()
- type args struct {
- summary *summary
- rowsToCompare int64
- }
- tests := []struct {
- name string
- args args
- want *vdiff.ProgressReport
- }{
- {
- name: "no progress",
- args: args{
- summary: &summary{RowsCompared: 0},
- rowsToCompare: 100,
- },
- want: &vdiff.ProgressReport{
- Percentage: 0,
- ETA: "", // no ETA
- },
- },
- {
- name: "one third of the way",
- args: args{
- summary: &summary{
- RowsCompared: 33,
- StartedAt: now.Add(-10 * time.Second).UTC().Format(vdiff.TimestampFormat),
- },
- rowsToCompare: 100,
- },
- want: &vdiff.ProgressReport{
- Percentage: 33,
- ETA: now.Add(20 * time.Second).UTC().Format(vdiff.TimestampFormat),
- },
- },
- {
- name: "half way",
- args: args{
- summary: &summary{
- RowsCompared: 5000000000,
- StartedAt: now.Add(-10 * time.Hour).UTC().Format(vdiff.TimestampFormat),
- },
- rowsToCompare: 10000000000,
- },
- want: &vdiff.ProgressReport{
- Percentage: 50,
- ETA: now.Add(10 * time.Hour).UTC().Format(vdiff.TimestampFormat),
- },
- },
- {
- name: "full progress",
- args: args{
- summary: &summary{
- RowsCompared: 100,
- CompletedAt: now.UTC().Format(vdiff.TimestampFormat),
- },
- rowsToCompare: 100,
- },
- want: &vdiff.ProgressReport{
- Percentage: 100,
- ETA: now.UTC().Format(vdiff.TimestampFormat),
- },
- },
- {
- name: "more than in I_S",
- args: args{
- summary: &summary{
- RowsCompared: 100,
- CompletedAt: now.UTC().Format(vdiff.TimestampFormat),
- },
- rowsToCompare: 50,
- },
- want: &vdiff.ProgressReport{
- Percentage: 100,
- ETA: now.UTC().Format(vdiff.TimestampFormat),
- },
- },
- }
- for _, tt := range tests {
- t.Run(tt.name, func(t *testing.T) {
- tt.args.summary.Progress = BuildProgressReport(tt.args.summary.RowsCompared, tt.args.rowsToCompare, tt.args.summary.StartedAt)
- // We always check the percentage
- require.Equal(t, int(tt.want.Percentage), int(tt.args.summary.Progress.Percentage))
-
- // We only check the ETA if there is one.
- if tt.want.ETA != "" {
- // Let's check that we're within 1 second to avoid flakes.
- wantTime, err := time.Parse(vdiff.TimestampFormat, tt.want.ETA)
- require.NoError(t, err)
- var timeDiff float64
- if tt.want.Percentage == 100 {
- completedTime, err := time.Parse(vdiff.TimestampFormat, tt.args.summary.CompletedAt)
- require.NoError(t, err)
- timeDiff = math.Abs(completedTime.Sub(wantTime).Seconds())
- } else {
- startTime, err := time.Parse(vdiff.TimestampFormat, tt.args.summary.StartedAt)
- require.NoError(t, err)
- completedTimeUnix := float64(now.UTC().Unix()-startTime.UTC().Unix()) * (100 / tt.want.Percentage)
- estimatedTime, err := time.Parse(vdiff.TimestampFormat, tt.want.ETA)
- require.NoError(t, err)
- timeDiff = math.Abs(estimatedTime.Sub(startTime).Seconds() - completedTimeUnix)
- }
- require.LessOrEqual(t, timeDiff, 1.0)
- }
- })
- }
-}
diff --git a/go/flags/endtoend/vtbackup.txt b/go/flags/endtoend/vtbackup.txt
index b4405960711..7bda9048211 100644
--- a/go/flags/endtoend/vtbackup.txt
+++ b/go/flags/endtoend/vtbackup.txt
@@ -195,6 +195,7 @@ Flags:
--remote_operation_timeout duration time to wait for a remote operation (default 15s)
--restart_before_backup Perform a mysqld clean/full restart after applying binlogs, but before taking the backup. Only makes sense to work around xtrabackup bugs.
--s3_backup_aws_endpoint string endpoint of the S3 backend (region must be provided).
+ --s3_backup_aws_min_partsize int Minimum part size to use, defaults to 5MiB but can be increased due to the dataset size. (default 5242880)
--s3_backup_aws_region string AWS region to use. (default "us-east-1")
--s3_backup_aws_retries int AWS request retries. (default -1)
--s3_backup_force_path_style force the s3 path style.
diff --git a/go/flags/endtoend/vtcombo.txt b/go/flags/endtoend/vtcombo.txt
index 5a1e4000fea..1c57dd0c08e 100644
--- a/go/flags/endtoend/vtcombo.txt
+++ b/go/flags/endtoend/vtcombo.txt
@@ -22,15 +22,7 @@ Flags:
--backup_storage_number_blocks int if backup_storage_compress is true, backup_storage_number_blocks sets the number of blocks that can be processed, in parallel, before the writer blocks, during compression (default is 2). It should be equal to the number of CPUs available for compression. (default 2)
--bind-address string Bind address for the server. If empty, the server will listen on all available unicast and anycast IP addresses of the local system.
--binlog-in-memory-decompressor-max-size uint This value sets the uncompressed transaction payload size at which we switch from in-memory buffer based decompression to the slower streaming mode. (default 134217728)
- --binlog_host string PITR restore parameter: hostname/IP of binlog server.
- --binlog_password string PITR restore parameter: password of binlog server.
--binlog_player_protocol string the protocol to download binlogs from a vttablet (default "grpc")
- --binlog_port int PITR restore parameter: port of binlog server.
- --binlog_ssl_ca string PITR restore parameter: Filename containing TLS CA certificate to verify binlog server TLS certificate against.
- --binlog_ssl_cert string PITR restore parameter: Filename containing mTLS client certificate to present to binlog server as authentication.
- --binlog_ssl_key string PITR restore parameter: Filename containing mTLS client private key for use in binlog server authentication.
- --binlog_ssl_server_name string PITR restore parameter: TLS server name (common name) to verify against for the binlog server we are connecting to (If not set: use the hostname or IP supplied in --binlog_host).
- --binlog_user string PITR restore parameter: username of binlog server.
--buffer_drain_concurrency int Maximum number of requests retried simultaneously. More concurrency will increase the load on the PRIMARY vttablet when draining the buffer. (default 1)
--buffer_keyspace_shards string If not empty, limit buffering to these entries (comma separated). Entry format: keyspace or keyspace/shard. Requires --enable_buffer=true.
--buffer_max_failover_duration duration Stop buffering completely if a failover takes longer than this duration. (default 20s)
@@ -261,7 +253,6 @@ Flags:
--onclose_timeout duration wait no more than this for OnClose handlers before stopping (default 10s)
--onterm_timeout duration wait no more than this for OnTermSync handlers before stopping (default 10s)
--pid_file string If set, the process will write its pid to the named file, and delete it on graceful shutdown.
- --pitr_gtid_lookup_timeout duration PITR restore parameter: timeout for fetching gtid from timestamp. (default 1m0s)
--planner-version string Sets the default planner to use when the session has not changed it. Valid values are: Gen4, Gen4Greedy, Gen4Left2Right
--pool_hostname_resolve_interval duration if set force an update to all hostnames and reconnect if changed, defaults to 0 (disabled)
--port int port for the server
diff --git a/go/flags/endtoend/vtctld.txt b/go/flags/endtoend/vtctld.txt
index be0f5114e79..c84c5fadf5f 100644
--- a/go/flags/endtoend/vtctld.txt
+++ b/go/flags/endtoend/vtctld.txt
@@ -110,6 +110,7 @@ Flags:
--purge_logs_interval duration how often try to remove old logs (default 1h0m0s)
--remote_operation_timeout duration time to wait for a remote operation (default 15s)
--s3_backup_aws_endpoint string endpoint of the S3 backend (region must be provided).
+ --s3_backup_aws_min_partsize int Minimum part size to use, defaults to 5MiB but can be increased due to the dataset size. (default 5242880)
--s3_backup_aws_region string AWS region to use. (default "us-east-1")
--s3_backup_aws_retries int AWS request retries. (default -1)
--s3_backup_force_path_style force the s3 path style.
diff --git a/go/flags/endtoend/vttablet.txt b/go/flags/endtoend/vttablet.txt
index 132c2d06344..bc647fb5347 100644
--- a/go/flags/endtoend/vttablet.txt
+++ b/go/flags/endtoend/vttablet.txt
@@ -57,20 +57,12 @@ Flags:
--backup_storage_number_blocks int if backup_storage_compress is true, backup_storage_number_blocks sets the number of blocks that can be processed, in parallel, before the writer blocks, during compression (default is 2). It should be equal to the number of CPUs available for compression. (default 2)
--bind-address string Bind address for the server. If empty, the server will listen on all available unicast and anycast IP addresses of the local system.
--binlog-in-memory-decompressor-max-size uint This value sets the uncompressed transaction payload size at which we switch from in-memory buffer based decompression to the slower streaming mode. (default 134217728)
- --binlog_host string PITR restore parameter: hostname/IP of binlog server.
- --binlog_password string PITR restore parameter: password of binlog server.
--binlog_player_grpc_ca string the server ca to use to validate servers when connecting
--binlog_player_grpc_cert string the cert to use to connect
--binlog_player_grpc_crl string the server crl to use to validate server certificates when connecting
--binlog_player_grpc_key string the key to use to connect
--binlog_player_grpc_server_name string the server name to use to validate server certificate
--binlog_player_protocol string the protocol to download binlogs from a vttablet (default "grpc")
- --binlog_port int PITR restore parameter: port of binlog server.
- --binlog_ssl_ca string PITR restore parameter: Filename containing TLS CA certificate to verify binlog server TLS certificate against.
- --binlog_ssl_cert string PITR restore parameter: Filename containing mTLS client certificate to present to binlog server as authentication.
- --binlog_ssl_key string PITR restore parameter: Filename containing mTLS client private key for use in binlog server authentication.
- --binlog_ssl_server_name string PITR restore parameter: TLS server name (common name) to verify against for the binlog server we are connecting to (If not set: use the hostname or IP supplied in --binlog_host).
- --binlog_user string PITR restore parameter: username of binlog server.
--builtinbackup-file-read-buffer-size uint read files using an IO buffer of this many bytes. Golang defaults are used when set to 0.
--builtinbackup-file-write-buffer-size uint write files using an IO buffer of this many bytes. Golang defaults are used when set to 0. (default 2097152)
--builtinbackup-incremental-restore-path string the directory where incremental restore files, namely binlog files, are extracted to. In k8s environments, this should be set to a directory that is shared between the vttablet and mysqld pods. The path should exist. When empty, the default OS temp dir is assumed.
@@ -259,7 +251,6 @@ Flags:
--onterm_timeout duration wait no more than this for OnTermSync handlers before stopping (default 10s)
--opentsdb_uri string URI of opentsdb /api/put method
--pid_file string If set, the process will write its pid to the named file, and delete it on graceful shutdown.
- --pitr_gtid_lookup_timeout duration PITR restore parameter: timeout for fetching gtid from timestamp. (default 1m0s)
--pool_hostname_resolve_interval duration if set force an update to all hostnames and reconnect if changed, defaults to 0 (disabled)
--port int port for the server
--pprof strings enable profiling
@@ -312,6 +303,7 @@ Flags:
--restore_from_backup_ts string (init restore parameter) if set, restore the latest backup taken at or before this timestamp. Example: '2021-04-29.133050'
--retain_online_ddl_tables duration How long should vttablet keep an old migrated table before purging it (default 24h0m0s)
--s3_backup_aws_endpoint string endpoint of the S3 backend (region must be provided).
+ --s3_backup_aws_min_partsize int Minimum part size to use, defaults to 5MiB but can be increased due to the dataset size. (default 5242880)
--s3_backup_aws_region string AWS region to use. (default "us-east-1")
--s3_backup_aws_retries int AWS request retries. (default -1)
--s3_backup_force_path_style force the s3 path style.
diff --git a/go/mysql/binlog/binlog_json.go b/go/mysql/binlog/binlog_json.go
index 03bf604fb2d..51b4fef0ef8 100644
--- a/go/mysql/binlog/binlog_json.go
+++ b/go/mysql/binlog/binlog_json.go
@@ -17,6 +17,7 @@ limitations under the License.
package binlog
import (
+ "bytes"
"encoding/binary"
"fmt"
"math"
@@ -25,9 +26,12 @@ import (
"vitess.io/vitess/go/hack"
"vitess.io/vitess/go/mysql/format"
"vitess.io/vitess/go/mysql/json"
+ "vitess.io/vitess/go/sqltypes"
+ "vitess.io/vitess/go/vt/sqlparser"
+ "vitess.io/vitess/go/vt/vterrors"
+
querypb "vitess.io/vitess/go/vt/proto/query"
vtrpcpb "vitess.io/vitess/go/vt/proto/vtrpc"
- "vitess.io/vitess/go/vt/vterrors"
)
/*
@@ -44,6 +48,14 @@ https://github.com/shyiko/mysql-binlog-connector-java/pull/119/files
https://github.com/noplay/python-mysql-replication/blob/175df28cc8b536a68522ff9b09dc5440adad6094/pymysqlreplication/packet.py
*/
+type jsonDiffOp uint8
+
+const (
+ jsonDiffOpReplace = jsonDiffOp(iota)
+ jsonDiffOpInsert
+ jsonDiffOpRemove
+)
+
// ParseBinaryJSON provides the parsing function from the mysql binary json
// representation to a JSON value instance.
func ParseBinaryJSON(data []byte) (*json.Value, error) {
@@ -60,6 +72,168 @@ func ParseBinaryJSON(data []byte) (*json.Value, error) {
return node, nil
}
+// ParseBinaryJSONDiff provides the parsing function from the binary MySQL
+// JSON diff representation to an SQL expression. These diffs are included
+// in the AFTER image of PartialUpdateRows events which exist in MySQL 8.0
+// and later when the --binlog-row-value-options=PARTIAL_JSON is used. You
+// can read more about these here:
+// https://dev.mysql.com/blog-archive/efficient-json-replication-in-mysql-8-0/
+// https://dev.mysql.com/worklog/task/?id=2955
+// https://github.com/mysql/mysql-server/blob/trunk/sql-common/json_diff.h
+// https://github.com/mysql/mysql-server/blob/trunk/sql-common/json_diff.cc
+//
+// The binary format for the partial JSON column or JSON diff is:
+// +--------+--------+--------+ +--------+
+// | length | diff_1 | diff_2 | ... | diff_N |
+// +--------+--------+--------+ +--------+
+//
+// Each diff_i represents a single JSON diff. It has the following
+// format:
+// +-----------+-------------+------+ +-------------+------+
+// | operation | path_length | path | ( | data_length | data | )?
+// +-----------+-------------+------+ +-------------+------+
+//
+// The fields are:
+//
+// 1. operation: a single byte containing the JSON diff operation.
+// The possible values are defined by enum_json_diff_operation:
+// REPLACE=0
+// INSERT=1
+// REMOVE=2
+//
+// 2. path_length: an unsigned integer in net_field_length() format.
+//
+// 3. path: a string of 'path_length' bytes containing the JSON path
+// of the update.
+//
+// 4. data_length: an unsigned integer in net_field_length() format.
+//
+// 5. data: a string of 'data_length' bytes containing the JSON
+// document that will be inserted at the position specified by
+// 'path'.
+//
+// data_length and data are omitted if and only if operation=REMOVE.
+//
+// Examples of the resulting SQL expression are:
+// - "" for an empty diff when the column was not updated
+// - "null" for a JSON null
+// - "JSON_REMOVE(%s, _utf8mb4'$.salary')" for a REMOVE operation
+// - "JSON_INSERT(%s, _utf8mb4'$.role', CAST(JSON_QUOTE(_utf8mb4'manager') as JSON))" for an INSERT operation
+// - "JSON_INSERT(JSON_REMOVE(JSON_REPLACE(%s, _utf8mb4'$.day', CAST(JSON_QUOTE(_utf8mb4'tuesday') as JSON)), _utf8mb4'$.favorite_color'), _utf8mb4'$.hobby', CAST(JSON_QUOTE(_utf8mb4'skiing') as JSON))" for a more complex example
+func ParseBinaryJSONDiff(data []byte) (sqltypes.Value, error) {
+ if len(data) == 0 {
+ // An empty diff is used as a way to elide the column from
+ // the AFTER image when it was not updated in the row event.
+ return sqltypes.MakeTrusted(sqltypes.Expression, data), nil
+ }
+
+ diff := bytes.Buffer{}
+ // Reasonable estimate of the space we'll need to build the SQL
+ // expression in order to try and avoid reallocations w/o
+ // overallocating too much.
+ diff.Grow(len(data) + 80)
+ pos := 0
+ outer := false
+ innerStr := ""
+
+ // Create the SQL expression from the data which will consist of
+ // a sequence of JSON_X(col/json, path[, value]) clauses where X
+ // is REPLACE, INSERT, or REMOVE. The data can also be a JSON
+ // null, which is a special case we handle here as well. We take
+ // a binary representation of a vector of JSON diffs, for example:
+ // (REPLACE, '$.a', '7')
+ // (REMOVE, '$.d[0]')
+ // (INSERT, '$.e', '"ee"')
+ // (INSERT, '$.f[1]', '"ff"')
+ // (INSERT, '$.g', '"gg"')
+ // And build an SQL expression from it:
+ // JSON_INSERT(
+ // JSON_INSERT(
+ // JSON_INSERT(
+ // JSON_REMOVE(
+ // JSON_REPLACE(
+ // col, '$.a', 7),
+ // '$.d[0]'),
+ // '$.e', 'ee'),
+ // '$.f[3]', 'ff'),
+ // '$.g', 'gg')
+ for pos < len(data) {
+ opType := jsonDiffOp(data[pos])
+ pos++
+ if outer {
+ // We process the bytes sequentially but build the SQL
+ // expression from the inner most function to the outer most
+ // and thus need to wrap any subsequent functions around the
+ // previous one(s). For example:
+ // - inner: JSON_REPLACE(%s, '$.a', 7)
+ // - outer: JSON_REMOVE(, '$.b')
+ innerStr = diff.String()
+ diff.Reset()
+ }
+ switch opType {
+ case jsonDiffOpReplace:
+ diff.WriteString("JSON_REPLACE(")
+ case jsonDiffOpInsert:
+ diff.WriteString("JSON_INSERT(")
+ case jsonDiffOpRemove:
+ diff.WriteString("JSON_REMOVE(")
+ default:
+ // Can be a JSON null.
+ js, err := ParseBinaryJSON(data)
+ if err == nil && js.Type() == json.TypeNull {
+ return sqltypes.MakeTrusted(sqltypes.Expression, js.MarshalSQLTo(nil)), nil
+ }
+ return sqltypes.Value{}, vterrors.Errorf(vtrpcpb.Code_INVALID_ARGUMENT,
+ "invalid JSON diff operation: %d", opType)
+ }
+ if outer {
+ // Wrap this outer function around the previous inner one(s).
+ diff.WriteString(innerStr)
+ diff.WriteString(", ")
+ } else { // Only the inner most function has the field name
+ diff.WriteString("%s, ") // This will later be replaced by the field name
+ }
+ outer = true
+
+ // Read the JSON document path that we want to operate on.
+ pathLen, readTo := readVariableLength(data, pos)
+ pos = readTo
+ path := data[pos : pos+pathLen]
+ pos += pathLen
+ // We have to specify the unicode character set for the path we
+ // use in the expression as the connection can be using a different
+ // character set (e.g. vreplication always uses set names binary).
+ // The generated path will look like this: _utf8mb4'$.role'
+ diff.WriteString(sqlparser.Utf8mb4Str)
+ diff.WriteByte('\'')
+ diff.Write(path)
+ diff.WriteByte('\'')
+ if opType == jsonDiffOpRemove { // No value for remove
+ diff.WriteByte(')') // Close the JSON function
+ continue
+ }
+
+ diff.WriteString(", ")
+ // Read the value that we want to set.
+ valueLen, readTo := readVariableLength(data, pos)
+ pos = readTo
+ // Parse the native JSON type and its value that we want to set
+ // (string, number, object, array, null).
+ value, err := ParseBinaryJSON(data[pos : pos+valueLen])
+ if err != nil {
+ return sqltypes.Value{}, vterrors.Wrapf(err,
+ "cannot read JSON diff value for path %q", path)
+ }
+ pos += valueLen
+ // Generate the SQL clause for the JSON value. For example:
+ // CAST(JSON_QUOTE(_utf8mb4'manager') as JSON)
+ diff.Write(value.MarshalSQLTo(nil))
+ diff.WriteByte(')') // Close the JSON function
+ }
+
+ return sqltypes.MakeTrusted(sqltypes.Expression, diff.Bytes()), nil
+}
+
// jsonDataType has the values used in the mysql json binary representation to denote types.
// We have string, literal(true/false/null), number, object or array types.
// large object => doc size > 64K: you get pointers instead of inline values.
@@ -315,7 +489,7 @@ func binparserOpaque(_ jsonDataType, data []byte, pos int) (node *json.Value, er
precision := decimalData[0]
scale := decimalData[1]
metadata := (uint16(precision) << 8) + uint16(scale)
- val, _, err := CellValue(decimalData, 2, TypeNewDecimal, metadata, &querypb.Field{Type: querypb.Type_DECIMAL})
+ val, _, err := CellValue(decimalData, 2, TypeNewDecimal, metadata, &querypb.Field{Type: querypb.Type_DECIMAL}, false)
if err != nil {
return nil, err
}
diff --git a/go/mysql/binlog/rbr.go b/go/mysql/binlog/rbr.go
index 8b95b0daee9..7512413f606 100644
--- a/go/mysql/binlog/rbr.go
+++ b/go/mysql/binlog/rbr.go
@@ -26,9 +26,10 @@ import (
"time"
"vitess.io/vitess/go/sqltypes"
- querypb "vitess.io/vitess/go/vt/proto/query"
- "vitess.io/vitess/go/vt/proto/vtrpc"
"vitess.io/vitess/go/vt/vterrors"
+
+ querypb "vitess.io/vitess/go/vt/proto/query"
+ vtrpcpb "vitess.io/vitess/go/vt/proto/vtrpc"
)
// ZeroTimestamp is the special value 0 for a timestamp.
@@ -130,7 +131,7 @@ func CellLength(data []byte, pos int, typ byte, metadata uint16) (int, error) {
uint32(data[pos+2])<<16|
uint32(data[pos+3])<<24), nil
default:
- return 0, vterrors.Errorf(vtrpc.Code_INTERNAL, "unsupported blob/geometry metadata value %v (data: %v pos: %v)", metadata, data, pos)
+ return 0, vterrors.Errorf(vtrpcpb.Code_INTERNAL, "unsupported blob/geometry metadata value %v (data: %v pos: %v)", metadata, data, pos)
}
case TypeString:
// This may do String, Enum, and Set. The type is in
@@ -151,7 +152,7 @@ func CellLength(data []byte, pos int, typ byte, metadata uint16) (int, error) {
return l + 1, nil
default:
- return 0, vterrors.Errorf(vtrpc.Code_INTERNAL, "unsupported type %v (data: %v pos: %v)", typ, data, pos)
+ return 0, vterrors.Errorf(vtrpcpb.Code_INTERNAL, "unsupported type %v (data: %v pos: %v)", typ, data, pos)
}
}
@@ -176,7 +177,7 @@ func printTimestamp(v uint32) *bytes.Buffer {
// byte to determine general shared aspects of types and the querypb.Field to
// determine other info specifically about its underlying column (SQL column
// type, column length, charset, etc)
-func CellValue(data []byte, pos int, typ byte, metadata uint16, field *querypb.Field) (sqltypes.Value, int, error) {
+func CellValue(data []byte, pos int, typ byte, metadata uint16, field *querypb.Field, partialJSON bool) (sqltypes.Value, int, error) {
switch typ {
case TypeTiny:
if sqltypes.IsSigned(field.Type) {
@@ -644,7 +645,7 @@ func CellValue(data []byte, pos int, typ byte, metadata uint16, field *querypb.F
return sqltypes.MakeTrusted(querypb.Type_ENUM,
strconv.AppendUint(nil, uint64(val), 10)), 2, nil
default:
- return sqltypes.NULL, 0, vterrors.Errorf(vtrpc.Code_INTERNAL, "unexpected enum size: %v", metadata&0xff)
+ return sqltypes.NULL, 0, vterrors.Errorf(vtrpcpb.Code_INTERNAL, "unexpected enum size: %v", metadata&0xff)
}
case TypeSet:
@@ -672,14 +673,20 @@ func CellValue(data []byte, pos int, typ byte, metadata uint16, field *querypb.F
uint32(data[pos+2])<<16 |
uint32(data[pos+3])<<24)
default:
- return sqltypes.NULL, 0, vterrors.Errorf(vtrpc.Code_INTERNAL, "unsupported blob metadata value %v (data: %v pos: %v)", metadata, data, pos)
+ return sqltypes.NULL, 0, vterrors.Errorf(vtrpcpb.Code_INTERNAL, "unsupported blob metadata value %v (data: %v pos: %v)", metadata, data, pos)
}
pos += int(metadata)
// For JSON, we parse the data, and emit SQL.
if typ == TypeJSON {
- var err error
jsonData := data[pos : pos+l]
+ if partialJSON {
+ val, err := ParseBinaryJSONDiff(jsonData)
+ if err != nil {
+ panic(err)
+ }
+ return val, l + int(metadata), nil
+ }
jsonVal, err := ParseBinaryJSON(jsonData)
if err != nil {
panic(err)
@@ -710,7 +717,7 @@ func CellValue(data []byte, pos int, typ byte, metadata uint16, field *querypb.F
return sqltypes.MakeTrusted(querypb.Type_UINT16,
strconv.AppendUint(nil, uint64(val), 10)), 2, nil
default:
- return sqltypes.NULL, 0, vterrors.Errorf(vtrpc.Code_INTERNAL, "unexpected enum size: %v", metadata&0xff)
+ return sqltypes.NULL, 0, vterrors.Errorf(vtrpcpb.Code_INTERNAL, "unexpected enum size: %v", metadata&0xff)
}
}
if t == TypeSet {
@@ -776,13 +783,13 @@ func CellValue(data []byte, pos int, typ byte, metadata uint16, field *querypb.F
uint32(data[pos+2])<<16 |
uint32(data[pos+3])<<24)
default:
- return sqltypes.NULL, 0, vterrors.Errorf(vtrpc.Code_INTERNAL, "unsupported geometry metadata value %v (data: %v pos: %v)", metadata, data, pos)
+ return sqltypes.NULL, 0, vterrors.Errorf(vtrpcpb.Code_INTERNAL, "unsupported geometry metadata value %v (data: %v pos: %v)", metadata, data, pos)
}
pos += int(metadata)
return sqltypes.MakeTrusted(querypb.Type_GEOMETRY,
data[pos:pos+l]), l + int(metadata), nil
default:
- return sqltypes.NULL, 0, vterrors.Errorf(vtrpc.Code_INTERNAL, "unsupported type %v", typ)
+ return sqltypes.NULL, 0, vterrors.Errorf(vtrpcpb.Code_INTERNAL, "unsupported type %v", typ)
}
}
diff --git a/go/mysql/binlog/rbr_test.go b/go/mysql/binlog/rbr_test.go
index 1dfaf90a33e..ce49e587e6c 100644
--- a/go/mysql/binlog/rbr_test.go
+++ b/go/mysql/binlog/rbr_test.go
@@ -550,7 +550,7 @@ func TestCellLengthAndData(t *testing.T) {
}
// Test CellValue.
- out, l, err := CellValue(padded, 1, tcase.typ, tcase.metadata, &querypb.Field{Type: tcase.styp})
+ out, l, err := CellValue(padded, 1, tcase.typ, tcase.metadata, &querypb.Field{Type: tcase.styp}, false)
if err != nil || l != len(tcase.data) || out.Type() != tcase.out.Type() || !bytes.Equal(out.Raw(), tcase.out.Raw()) {
t.Errorf("testcase cellData(%v,%v) returned unexpected result: %v %v %v, was expecting %v %v \nwant: %s\ngot: %s",
tcase.typ, tcase.data, out, l, err, tcase.out, len(tcase.data), tcase.out.Raw(), out.Raw())
diff --git a/go/mysql/binlog_event.go b/go/mysql/binlog_event.go
index 5d472230d0e..72c228b594e 100644
--- a/go/mysql/binlog_event.go
+++ b/go/mysql/binlog_event.go
@@ -86,9 +86,20 @@ type BinlogEvent interface {
IsWriteRows() bool
// IsUpdateRows returns true if this is a UPDATE_ROWS_EVENT.
IsUpdateRows() bool
+ // IsPartialUpdateRows returs true if a partial JSON update event
+ // is found. These events are only seen in MySQL 8.0 if the mysqld
+ // instance has binlog_row_value_options=PARTIAL_JSON set.
+ IsPartialUpdateRows() bool
// IsDeleteRows returns true if this is a DELETE_ROWS_EVENT.
IsDeleteRows() bool
+ // IsPseudo is for custom implementations of GTID.
+ IsPseudo() bool
+
+ // IsTransactionPayload returns true if a compressed transaction
+ // payload event is found (binlog_transaction_compression=ON).
+ IsTransactionPayload() bool
+
// Timestamp returns the timestamp from the event header.
Timestamp() uint32
// ServerID returns the server ID from the event header.
@@ -123,8 +134,8 @@ type BinlogEvent interface {
TableMap(BinlogFormat) (*TableMap, error)
// Rows returns a Rows struct representing data from a
// {WRITE,UPDATE,DELETE}_ROWS_EVENT. This is only valid if
- // IsWriteRows(), IsUpdateRows(), or IsDeleteRows() returns
- // true.
+ // IsWriteRows(), IsUpdateRows(), IsPartialUpdateRows(), or
+ // IsDeleteRows() returns true.
Rows(BinlogFormat, *TableMap) (Rows, error)
// TransactionPayload returns a TransactionPayload type which provides
// a GetNextEvent() method to iterate over the events contained within
@@ -141,13 +152,6 @@ type BinlogEvent interface {
// the same event and a nil checksum.
StripChecksum(BinlogFormat) (ev BinlogEvent, checksum []byte, err error)
- // IsPseudo is for custom implementations of GTID.
- IsPseudo() bool
-
- // IsTransactionPayload returns true if a compressed transaction
- // payload event is found (binlog_transaction_compression=ON).
- IsTransactionPayload() bool
-
// Bytes returns the binary representation of the event
Bytes() []byte
}
@@ -266,6 +270,12 @@ type Row struct {
// It is only set for UPDATE and DELETE events.
Identify []byte
+ // If this row was from a PartialUpdateRows event and it contains
+ // 1 or more JSON columns with partial values, then this will be
+ // set as a bitmap of which JSON columns in the AFTER image have
+ // partial values.
+ JSONPartialValues Bitmap
+
// Data is the raw data.
// It is only set for WRITE and UPDATE events.
Data []byte
diff --git a/go/mysql/binlog_event_common.go b/go/mysql/binlog_event_common.go
index c95873614f0..548875c44f7 100644
--- a/go/mysql/binlog_event_common.go
+++ b/go/mysql/binlog_event_common.go
@@ -187,6 +187,11 @@ func (ev binlogEvent) IsUpdateRows() bool {
ev.Type() == eUpdateRowsEventV2
}
+// IsPartialUpdateRows implements BinlogEvent.IsPartialUpdateRows().
+func (ev binlogEvent) IsPartialUpdateRows() bool {
+ return ev.Type() == ePartialUpdateRowsEvent
+}
+
// IsDeleteRows implements BinlogEvent.IsDeleteRows().
// We do not support v0.
func (ev binlogEvent) IsDeleteRows() bool {
diff --git a/go/mysql/binlog_event_filepos.go b/go/mysql/binlog_event_filepos.go
index c71c8346964..b7e6ed9e0f2 100644
--- a/go/mysql/binlog_event_filepos.go
+++ b/go/mysql/binlog_event_filepos.go
@@ -203,6 +203,10 @@ func (ev filePosFakeEvent) IsUpdateRows() bool {
return false
}
+func (ev filePosFakeEvent) IsPartialUpdateRows() bool {
+ return false
+}
+
func (ev filePosFakeEvent) IsDeleteRows() bool {
return false
}
diff --git a/go/mysql/binlog_event_mysql56_test.go b/go/mysql/binlog_event_mysql56_test.go
index 5844779de63..ede2abece99 100644
--- a/go/mysql/binlog_event_mysql56_test.go
+++ b/go/mysql/binlog_event_mysql56_test.go
@@ -27,6 +27,7 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
+ "vitess.io/vitess/go/mysql/collations"
"vitess.io/vitess/go/mysql/replication"
)
@@ -248,3 +249,480 @@ func TestMysql56SemiSyncAck(t *testing.T) {
assert.True(t, e.IsQuery())
}
}
+
+func TestMySQL56PartialUpdateRowsEvent(t *testing.T) {
+ format := BinlogFormat{
+ HeaderSizes: []byte{
+ 0, 13, 0, 8, 0, 0, 0, 0, 4, 0, 4, 0, 0, 0, 98, 0, 4, 26, 8, 0, 0, 0, 8, 8, 8, 2, 0, 0, 0, 10, 10, 10, 42, 42, 0, 18, 52, 0, 10, 40, 0,
+ },
+ ServerVersion: "8.0.40",
+ FormatVersion: 4,
+ HeaderLength: 19,
+ ChecksumAlgorithm: 1,
+ }
+ // This is from the following table structure:
+ // CREATE TABLE `customer` (
+ // `customer_id` bigint NOT NULL AUTO_INCREMENT,
+ // `email` varbinary(128) DEFAULT NULL,
+ // `jd` json DEFAULT NULL,
+ // PRIMARY KEY (`customer_id`)
+ // )
+ tm := &TableMap{
+ Flags: 1,
+ Database: "vt_commerce",
+ Name: "customer",
+ Types: []byte{8, 15, 245},
+ CanBeNull: Bitmap{
+ data: []byte{6},
+ count: 3,
+ },
+ Metadata: []uint16{0, 128, 4},
+ ColumnCollationIDs: []collations.ID{63},
+ }
+
+ testCases := []struct {
+ name string
+ rawEvent []byte
+ numRows int
+ want string
+ }{
+ {
+ name: "INSERT",
+ // The mysqlbinlog -vvv --base64-output=decode-rows output for the following event:
+ // ### UPDATE `vt_commerce`.`customer`
+ // ### WHERE
+ // ### @1=1 /* LONGINT meta=0 nullable=0 is_null=0 */
+ // ### @2='alice@domain.com' /* VARSTRING(128) meta=128 nullable=1 is_null=0 */
+ // ### @3='{"salary": 100}' /* JSON meta=4 nullable=1 is_null=0 */
+ // ### SET
+ // ### @1=1 /* LONGINT meta=0 nullable=0 is_null=0 */
+ // ### @2='alice@domain.com' /* VARSTRING(128) meta=128 nullable=1 is_null=0 */
+ // ### @3=JSON_INSERT(@3, '$.role', 'manager') /* JSON meta=4 nullable=1 is_null=0 */
+ // ### UPDATE `vt_commerce`.`customer`
+ // ### WHERE
+ // ### @1=2 /* LONGINT meta=0 nullable=0 is_null=0 */
+ // ### @2='bob@domain.com' /* VARSTRING(128) meta=128 nullable=1 is_null=0 */
+ // ### @3='{"salary": 99}' /* JSON meta=4 nullable=1 is_null=0 */
+ // ### SET
+ // ### @1=2 /* LONGINT meta=0 nullable=0 is_null=0 */
+ // ### @2='bob@domain.com' /* VARSTRING(128) meta=128 nullable=1 is_null=0 */
+ // ### @3=JSON_INSERT(@3, '$.role', 'manager') /* JSON meta=4 nullable=1 is_null=0 */
+ // ### UPDATE `vt_commerce`.`customer`
+ // ### WHERE
+ // ### @1=3 /* LONGINT meta=0 nullable=0 is_null=0 */
+ // ### @2='charlie@domain.com' /* VARSTRING(128) meta=128 nullable=1 is_null=0 */
+ // ### @3='{"salary": 99}' /* JSON meta=4 nullable=1 is_null=0 */
+ // ### SET
+ // ### @1=3 /* LONGINT meta=0 nullable=0 is_null=0 */
+ // ### @2='charlie@domain.com' /* VARSTRING(128) meta=128 nullable=1 is_null=0 */
+ // ### @3=JSON_INSERT(@3, '$.role', 'manager') /* JSON meta=4 nullable=1 is_null=0 */
+ // ### UPDATE `vt_commerce`.`customer`
+ // ### WHERE
+ // ### @1=4 /* LONGINT meta=0 nullable=0 is_null=0 */
+ // ### @2='dan@domain.com' /* VARSTRING(128) meta=128 nullable=1 is_null=0 */
+ // ### @3='{"salary": 99}' /* JSON meta=4 nullable=1 is_null=0 */
+ // ### SET
+ // ### @1=4 /* LONGINT meta=0 nullable=0 is_null=0 */
+ // ### @2='dan@domain.com' /* VARSTRING(128) meta=128 nullable=1 is_null=0 */
+ // ### @3=JSON_INSERT(@3, '$.role', 'manager') /* JSON meta=4 nullable=1 is_null=0 */
+ // ### UPDATE `vt_commerce`.`customer`
+ // ### WHERE
+ // ### @1=5 /* LONGINT meta=0 nullable=0 is_null=0 */
+ // ### @2='eve@domain.com' /* VARSTRING(128) meta=128 nullable=1 is_null=0 */
+ // ### @3='{"salary": 100}' /* JSON meta=4 nullable=1 is_null=0 */
+ // ### SET
+ // ### @1=5 /* LONGINT meta=0 nullable=0 is_null=0 */
+ // ### @2='eve@domain.com' /* VARSTRING(128) meta=128 nullable=1 is_null=0 */
+ // ### @3=JSON_INSERT(@3, '$.role', 'manager') /* JSON meta=4 nullable=1 is_null=0 */
+ rawEvent: []byte{
+ 196, 19, 87, 103, 39, 47, 142, 143, 12, 6, 2, 0, 0, 229, 104, 0, 0, 0, 0, 176, 0, 0, 0, 0, 0, 1, 0, 2, 0, 3, 255, 255, 0, 1, 0, 0, 0, 0, 0,
+ 0, 0, 16, 97, 108, 105, 99, 101, 64, 100, 111, 109, 97, 105, 110, 46, 99, 111, 109, 18, 0, 0, 0, 0, 1, 0, 17, 0, 11, 0, 6, 0, 5, 100, 0, 115,
+ 97, 108, 97, 114, 121, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 16, 97, 108, 105, 99, 101, 64, 100, 111, 109, 97, 105, 110, 46, 99, 111, 109, 18, 0,
+ 0, 0, 1, 6, 36, 46, 114, 111, 108, 101, 9, 12, 7, 109, 97, 110, 97, 103, 101, 114, 0, 2, 0, 0, 0, 0, 0, 0, 0, 14, 98, 111, 98, 64, 100, 111,
+ 109, 97, 105, 110, 46, 99, 111, 109, 18, 0, 0, 0, 0, 1, 0, 17, 0, 11, 0, 6, 0, 5, 99, 0, 115, 97, 108, 97, 114, 121, 1, 1, 0, 2, 0, 0, 0, 0,
+ 0, 0, 0, 14, 98, 111, 98, 64, 100, 111, 109, 97, 105, 110, 46, 99, 111, 109, 18, 0, 0, 0, 1, 6, 36, 46, 114, 111, 108, 101, 9, 12, 7, 109, 97,
+ 110, 97, 103, 101, 114, 0, 3, 0, 0, 0, 0, 0, 0, 0, 18, 99, 104, 97, 114, 108, 105, 101, 64, 100, 111, 109, 97, 105, 110, 46, 99, 111, 109, 18,
+ 0, 0, 0, 0, 1, 0, 17, 0, 11, 0, 6, 0, 5, 99, 0, 115, 97, 108, 97, 114, 121, 1, 1, 0, 3, 0, 0, 0, 0, 0, 0, 0, 18, 99, 104, 97, 114, 108, 105,
+ 101, 64, 100, 111, 109, 97, 105, 110, 46, 99, 111, 109, 18, 0, 0, 0, 1, 6, 36, 46, 114, 111, 108, 101, 9, 12, 7, 109, 97, 110, 97, 103, 101,
+ 114, 0, 4, 0, 0, 0, 0, 0, 0, 0, 14, 100, 97, 110, 64, 100, 111, 109, 97, 105, 110, 46, 99, 111, 109, 18, 0, 0, 0, 0, 1, 0, 17, 0, 11, 0, 6, 0,
+ 5, 99, 0, 115, 97, 108, 97, 114, 121, 1, 1, 0, 4, 0, 0, 0, 0, 0, 0, 0, 14, 100, 97, 110, 64, 100, 111, 109, 97, 105, 110, 46, 99, 111, 109, 18,
+ 0, 0, 0, 1, 6, 36, 46, 114, 111, 108, 101, 9, 12, 7, 109, 97, 110, 97, 103, 101, 114, 0, 5, 0, 0, 0, 0, 0, 0, 0, 14, 101, 118, 101, 64, 100,
+ 111, 109, 97, 105, 110, 46, 99, 111, 109, 18, 0, 0, 0, 0, 1, 0, 17, 0, 11, 0, 6, 0, 5, 100, 0, 115, 97, 108, 97, 114, 121, 1, 1, 0, 5, 0, 0, 0,
+ 0, 0, 0, 0, 14, 101, 118, 101, 64, 100, 111, 109, 97, 105, 110, 46, 99, 111, 109, 18, 0, 0, 0, 1, 6, 36, 46, 114, 111, 108, 101, 9, 12, 7, 109,
+ 97, 110, 97, 103, 101, 114,
+ },
+ numRows: 5,
+ want: "JSON_INSERT(%s, _utf8mb4'$.role', CAST(JSON_QUOTE(_utf8mb4'manager') as JSON))",
+ },
+ {
+ // The mysqlbinlog -vvv --base64-output=decode-rows output for the following event:
+ // ### UPDATE `vt_commerce`.`customer`
+ // ### WHERE
+ // ### @1=1 /* LONGINT meta=0 nullable=0 is_null=0 */
+ // ### @2='alice@domain.com' /* VARSTRING(128) meta=128 nullable=1 is_null=0 */
+ // ### @3='{"role": "manager", "salary": 100}' /* JSON meta=4 nullable=1 is_null=0 */
+ // ### SET
+ // ### @1=1 /* LONGINT meta=0 nullable=0 is_null=0 */
+ // ### @2='alice@domain.com' /* VARSTRING(128) meta=128 nullable=1 is_null=0 */
+ // ### @3=JSON_REPLACE(@3, '$.role', 'IC') /* JSON meta=4 nullable=1 is_null=0 */
+ rawEvent: []byte{
+ 155, 21, 87, 103, 39, 47, 142, 143, 12, 148, 0, 0, 0, 135, 106, 0, 0, 0, 0, 176, 0, 0, 0, 0, 0, 1, 0, 2, 0, 3, 255, 255, 0, 1, 0, 0, 0, 0, 0, 0,
+ 0, 16, 97, 108, 105, 99, 101, 64, 100, 111, 109, 97, 105, 110, 46, 99, 111, 109, 37, 0, 0, 0, 0, 2, 0, 36, 0, 18, 0, 4, 0, 22, 0, 6, 0, 12, 28,
+ 0, 5, 100, 0, 114, 111, 108, 101, 115, 97, 108, 97, 114, 121, 7, 109, 97, 110, 97, 103, 101, 114, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 16, 97, 108,
+ 105, 99, 101, 64, 100, 111, 109, 97, 105, 110, 46, 99, 111, 109, 13, 0, 0, 0, 0, 6, 36, 46, 114, 111, 108, 101, 4, 12, 2, 73, 67,
+ },
+ name: "REPLACE",
+ numRows: 1,
+ want: "JSON_REPLACE(%s, _utf8mb4'$.role', CAST(JSON_QUOTE(_utf8mb4'IC') as JSON))",
+ },
+ {
+ name: "REMOVE",
+ // The mysqlbinlog -vvv --base64-output=decode-rows output for the following event:
+ // ### UPDATE `vt_commerce`.`customer`
+ // ### WHERE
+ // ### @1=2 /* LONGINT meta=0 nullable=0 is_null=0 */
+ // ### @2='bob@domain.com' /* VARSTRING(128) meta=128 nullable=1 is_null=0 */
+ // ### @3='{"role": "manager", "salary": 99}' /* JSON meta=4 nullable=1 is_null=0 */
+ // ### SET
+ // ### @1=2 /* LONGINT meta=0 nullable=0 is_null=0 */
+ // ### @2='bob@domain.com' /* VARSTRING(128) meta=128 nullable=1 is_null=0 */
+ // ### @3=JSON_REMOVE(@3, '$.salary') /* JSON meta=4 nullable=1 is_null=0 */
+ numRows: 1,
+ rawEvent: []byte{
+ 176, 22, 87, 103, 39, 47, 142, 143, 12, 141, 0, 0, 0, 34, 108, 0, 0, 0, 0, 176, 0, 0, 0, 0, 0, 1, 0, 2, 0, 3, 255, 255, 0, 2, 0, 0, 0, 0, 0, 0, 0,
+ 14, 98, 111, 98, 64, 100, 111, 109, 97, 105, 110, 46, 99, 111, 109, 37, 0, 0, 0, 0, 2, 0, 36, 0, 18, 0, 4, 0, 22, 0, 6, 0, 12, 28, 0, 5, 99, 0, 114,
+ 111, 108, 101, 115, 97, 108, 97, 114, 121, 7, 109, 97, 110, 97, 103, 101, 114, 1, 1, 0, 2, 0, 0, 0, 0, 0, 0, 0, 14, 98, 111, 98, 64, 100, 111, 109,
+ 97, 105, 110, 46, 99, 111, 109, 10, 0, 0, 0, 2, 8, 36, 46, 115, 97, 108, 97, 114, 121,
+ },
+ want: "JSON_REMOVE(%s, _utf8mb4'$.salary')",
+ },
+ {
+ name: "REMOVE and REPLACE",
+ // The mysqlbinlog -vvv --base64-output=decode-rows output for the following event:
+ // ### UPDATE `vt_commerce`.`customer`
+ // ### WHERE
+ // ### @1=1 /* LONGINT meta=0 nullable=0 is_null=0 */
+ // ### @2='alice@domain.com' /* VARSTRING(128) meta=128 nullable=1 is_null=0 */
+ // ### @3='{"day": "friday", "role": "manager", "color": "red", "salary": 100, "favorite_color": "black"}' /* JSON meta=4 nullable=1 is_null=0 */
+ // ### SET
+ // ### @1=1 /* LONGINT meta=0 nullable=0 is_null=0 */
+ // ### @2='alice@domain.com' /* VARSTRING(128) meta=128 nullable=1 is_null=0 */
+ // ### @3=JSON_REMOVE(
+ // ### JSON_REPLACE(@3, '$.day', 'monday'),
+ // ### '$.favorite_color') /* JSON meta=4 nullable=1 is_null=0 */
+ // ### UPDATE `vt_commerce`.`customer`
+ // ### WHERE
+ // ### @1=2 /* LONGINT meta=0 nullable=0 is_null=0 */
+ // ### @2='bob@domain.com' /* VARSTRING(128) meta=128 nullable=1 is_null=0 */
+ // ### @3='{"day": "friday", "role": "manager", "color": "red", "salary": 99, "favorite_color": "black"}' /* JSON meta=4 nullable=1 is_null=0 */
+ // ### SET
+ // ### @1=2 /* LONGINT meta=0 nullable=0 is_null=0 */
+ // ### @2='bob@domain.com' /* VARSTRING(128) meta=128 nullable=1 is_null=0 */
+ // ### @3=JSON_REMOVE(
+ // ### JSON_REPLACE(@3, '$.day', 'monday'),
+ // ### '$.favorite_color') /* JSON meta=4 nullable=1 is_null=0 */
+ // ### UPDATE `vt_commerce`.`customer`
+ // ### WHERE
+ // ### @1=3 /* LONGINT meta=0 nullable=0 is_null=0 */
+ // ### @2='charlie@domain.com' /* VARSTRING(128) meta=128 nullable=1 is_null=0 */
+ // ### @3='{"day": "friday", "role": "manager", "color": "red", "salary": 99, "favorite_color": "black"}' /* JSON meta=4 nullable=1 is_null=0 */
+ // ### SET
+ // ### @1=3 /* LONGINT meta=0 nullable=0 is_null=0 */
+ // ### @2='charlie@domain.com' /* VARSTRING(128) meta=128 nullable=1 is_null=0 */
+ // ### @3=JSON_REMOVE(
+ // ### JSON_REPLACE(@3, '$.day', 'monday'),
+ // ### '$.favorite_color') /* JSON meta=4 nullable=1 is_null=0 */
+ // ### UPDATE `vt_commerce`.`customer`
+ // ### WHERE
+ // ### @1=4 /* LONGINT meta=0 nullable=0 is_null=0 */
+ // ### @2='dan@domain.com' /* VARSTRING(128) meta=128 nullable=1 is_null=0 */
+ // ### @3='{"day": "friday", "role": "manager", "color": "red", "salary": 99, "favorite_color": "black"}' /* JSON meta=4 nullable=1 is_null=0 */
+ // ### SET
+ // ### @1=4 /* LONGINT meta=0 nullable=0 is_null=0 */
+ // ### @2='dan@domain.com' /* VARSTRING(128) meta=128 nullable=1 is_null=0 */
+ // ### @3=JSON_REMOVE(
+ // ### JSON_REPLACE(@3, '$.day', 'monday'),
+ // ### '$.favorite_color') /* JSON meta=4 nullable=1 is_null=0 */
+ // ### UPDATE `vt_commerce`.`customer`
+ // ### WHERE
+ // ### @1=5 /* LONGINT meta=0 nullable=0 is_null=0 */
+ // ### @2='eve@domain.com' /* VARSTRING(128) meta=128 nullable=1 is_null=0 */
+ // ### @3='{"day": "friday", "role": "manager", "color": "red", "salary": 100, "favorite_color": "black"}' /* JSON meta=4 nullable=1 is_null=0 */
+ // ### SET
+ // ### @1=5 /* LONGINT meta=0 nullable=0 is_null=0 */
+ // ### @2='eve@domain.com' /* VARSTRING(128) meta=128 nullable=1 is_null=0 */
+ // ### @3=JSON_REMOVE(
+ // ### JSON_REPLACE(@3, '$.day', 'monday'),
+ // ### '$.favorite_color') /* JSON meta=4 nullable=1 is_null=0 */
+ rawEvent: []byte{
+ 227, 240, 86, 103, 39, 74, 58, 208, 33, 225, 3, 0, 0, 173, 122, 0, 0, 0, 0, 176, 0, 0, 0, 0, 0, 1, 0, 2, 0, 3, 255, 255, 0, 1, 0, 0, 0, 0,
+ 0, 0, 0, 16, 97, 108, 105, 99, 101, 64, 100, 111, 109, 97, 105, 110, 46, 99, 111, 109, 97, 0, 0, 0, 0, 5, 0, 96, 0, 39, 0, 3, 0, 42, 0, 4,
+ 0, 46, 0, 5, 0, 51, 0, 6, 0, 57, 0, 14, 0, 12, 71, 0, 12, 78, 0, 12, 86, 0, 5, 100, 0, 12, 90, 0, 100, 97, 121, 114, 111, 108, 101, 99, 111,
+ 108, 111, 114, 115, 97, 108, 97, 114, 121, 102, 97, 118, 111, 114, 105, 116, 101, 95, 99, 111, 108, 111, 114, 6, 102, 114, 105, 100, 97, 121,
+ 7, 109, 97, 110, 97, 103, 101, 114, 3, 114, 101, 100, 5, 98, 108, 97, 99, 107, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 16, 97, 108, 105, 99, 101,
+ 64, 100, 111, 109, 97, 105, 110, 46, 99, 111, 109, 34, 0, 0, 0, 0, 5, 36, 46, 100, 97, 121, 8, 12, 6, 109, 111, 110, 100, 97, 121, 2, 16, 36,
+ 46, 102, 97, 118, 111, 114, 105, 116, 101, 95, 99, 111, 108, 111, 114, 0, 2, 0, 0, 0, 0, 0, 0, 0, 14, 98, 111, 98, 64, 100, 111, 109, 97,
+ 105, 110, 46, 99, 111, 109, 97, 0, 0, 0, 0, 5, 0, 96, 0, 39, 0, 3, 0, 42, 0, 4, 0, 46, 0, 5, 0, 51, 0, 6, 0, 57, 0, 14, 0, 12, 71, 0, 12, 78,
+ 0, 12, 86, 0, 5, 99, 0, 12, 90, 0, 100, 97, 121, 114, 111, 108, 101, 99, 111, 108, 111, 114, 115, 97, 108, 97, 114, 121, 102, 97, 118, 111,
+ 114, 105, 116, 101, 95, 99, 111, 108, 111, 114, 6, 102, 114, 105, 100, 97, 121, 7, 109, 97, 110, 97, 103, 101, 114, 3, 114, 101, 100, 5, 98,
+ 108, 97, 99, 107, 1, 1, 0, 2, 0, 0, 0, 0, 0, 0, 0, 14, 98, 111, 98, 64, 100, 111, 109, 97, 105, 110, 46, 99, 111, 109, 34, 0, 0, 0, 0, 5, 36,
+ 46, 100, 97, 121, 8, 12, 6, 109, 111, 110, 100, 97, 121, 2, 16, 36, 46, 102, 97, 118, 111, 114, 105, 116, 101, 95, 99, 111, 108, 111, 114, 0,
+ 3, 0, 0, 0, 0, 0, 0, 0, 18, 99, 104, 97, 114, 108, 105, 101, 64, 100, 111, 109, 97, 105, 110, 46, 99, 111, 109, 97, 0, 0, 0, 0, 5, 0, 96, 0,
+ 39, 0, 3, 0, 42, 0, 4, 0, 46, 0, 5, 0, 51, 0, 6, 0, 57, 0, 14, 0, 12, 71, 0, 12, 78, 0, 12, 86, 0, 5, 99, 0, 12, 90, 0, 100, 97, 121, 114,
+ 111, 108, 101, 99, 111, 108, 111, 114, 115, 97, 108, 97, 114, 121, 102, 97, 118, 111, 114, 105, 116, 101, 95, 99, 111, 108, 111, 114, 6, 102,
+ 114, 105, 100, 97, 121, 7, 109, 97, 110, 97, 103, 101, 114, 3, 114, 101, 100, 5, 98, 108, 97, 99, 107, 1, 1, 0, 3, 0, 0, 0, 0, 0, 0, 0, 18,
+ 99, 104, 97, 114, 108, 105, 101, 64, 100, 111, 109, 97, 105, 110, 46, 99, 111, 109, 34, 0, 0, 0, 0, 5, 36, 46, 100, 97, 121, 8, 12, 6, 109,
+ 111, 110, 100, 97, 121, 2, 16, 36, 46, 102, 97, 118, 111, 114, 105, 116, 101, 95, 99, 111, 108, 111, 114, 0, 4, 0, 0, 0, 0, 0, 0, 0, 14, 100,
+ 97, 110, 64, 100, 111, 109, 97, 105, 110, 46, 99, 111, 109, 97, 0, 0, 0, 0, 5, 0, 96, 0, 39, 0, 3, 0, 42, 0, 4, 0, 46, 0, 5, 0, 51, 0, 6, 0,
+ 57, 0, 14, 0, 12, 71, 0, 12, 78, 0, 12, 86, 0, 5, 99, 0, 12, 90, 0, 100, 97, 121, 114, 111, 108, 101, 99, 111, 108, 111, 114, 115, 97, 108,
+ 97, 114, 121, 102, 97, 118, 111, 114, 105, 116, 101, 95, 99, 111, 108, 111, 114, 6, 102, 114, 105, 100, 97, 121, 7, 109, 97, 110, 97, 103,
+ 101, 114, 3, 114, 101, 100, 5, 98, 108, 97, 99, 107, 1, 1, 0, 4, 0, 0, 0, 0, 0, 0, 0, 14, 100, 97, 110, 64, 100, 111, 109, 97, 105, 110, 46,
+ 99, 111, 109, 34, 0, 0, 0, 0, 5, 36, 46, 100, 97, 121, 8, 12, 6, 109, 111, 110, 100, 97, 121, 2, 16, 36, 46, 102, 97, 118, 111, 114, 105, 116,
+ 101, 95, 99, 111, 108, 111, 114, 0, 5, 0, 0, 0, 0, 0, 0, 0, 14, 101, 118, 101, 64, 100, 111, 109, 97, 105, 110, 46, 99, 111, 109, 97, 0, 0, 0,
+ 0, 5, 0, 96, 0, 39, 0, 3, 0, 42, 0, 4, 0, 46, 0, 5, 0, 51, 0, 6, 0, 57, 0, 14, 0, 12, 71, 0, 12, 78, 0, 12, 86, 0, 5, 100, 0, 12, 90, 0, 100,
+ 97, 121, 114, 111, 108, 101, 99, 111, 108, 111, 114, 115, 97, 108, 97, 114, 121, 102, 97, 118, 111, 114, 105, 116, 101, 95, 99, 111, 108, 111,
+ 114, 6, 102, 114, 105, 100, 97, 121, 7, 109, 97, 110, 97, 103, 101, 114, 3, 114, 101, 100, 5, 98, 108, 97, 99, 107, 1, 1, 0, 5, 0, 0, 0, 0, 0,
+ 0, 0, 14, 101, 118, 101, 64, 100, 111, 109, 97, 105, 110, 46, 99, 111, 109, 34, 0, 0, 0, 0, 5, 36, 46, 100, 97, 121, 8, 12, 6, 109, 111, 110,
+ 100, 97, 121, 2, 16, 36, 46, 102, 97, 118, 111, 114, 105, 116, 101, 95, 99, 111, 108, 111, 114,
+ },
+ numRows: 5,
+ want: "JSON_REMOVE(JSON_REPLACE(%s, _utf8mb4'$.day', CAST(JSON_QUOTE(_utf8mb4'monday') as JSON)), _utf8mb4'$.favorite_color')",
+ },
+ {
+ name: "INSERT and REMOVE and REPLACE",
+ // The mysqlbinlog -vvv --base64-output=decode-rows output for the following event:
+ // ### UPDATE `vt_commerce`.`customer`
+ // ### WHERE
+ // ### @1=3 /* LONGINT meta=0 nullable=0 is_null=0 */
+ // ### @2='charlie@domain.com' /* VARSTRING(128) meta=128 nullable=1 is_null=0 */
+ // ### @3='{"day": "monday", "role": "manager", "salary": 99, "favorite_color": "red"}' /* JSON meta=4 nullable=1 is_null=0 */
+ // ### SET
+ // ### @1=3 /* LONGINT meta=0 nullable=0 is_null=0 */
+ // ### @2='charlie@domain.com' /* VARSTRING(128) meta=128 nullable=1 is_null=0 */
+ // ### @3=JSON_INSERT(
+ // ### JSON_REMOVE(
+ // ### JSON_REPLACE(@3, '$.day', 'tuesday'),
+ // ### '$.favorite_color'),
+ // ### '$.hobby', 'skiing') /* JSON meta=4 nullable=1 is_null=0 */
+ rawEvent: []byte{
+ 48, 25, 87, 103, 39, 47, 142, 143, 12, 234, 0, 0, 0, 0, 117, 0, 0, 0, 0, 176, 0, 0, 0, 0, 0, 1, 0, 2, 0, 3, 255, 255, 0, 3, 0, 0, 0, 0, 0, 0, 0,
+ 18, 99, 104, 97, 114, 108, 105, 101, 64, 100, 111, 109, 97, 105, 110, 46, 99, 111, 109, 79, 0, 0, 0, 0, 4, 0, 78, 0, 32, 0, 3, 0, 35, 0, 4, 0,
+ 39, 0, 6, 0, 45, 0, 14, 0, 12, 59, 0, 12, 66, 0, 5, 99, 0, 12, 74, 0, 100, 97, 121, 114, 111, 108, 101, 115, 97, 108, 97, 114, 121, 102, 97,
+ 118, 111, 114, 105, 116, 101, 95, 99, 111, 108, 111, 114, 6, 109, 111, 110, 100, 97, 121, 7, 109, 97, 110, 97, 103, 101, 114, 3, 114, 101, 100,
+ 1, 1, 0, 3, 0, 0, 0, 0, 0, 0, 0, 18, 99, 104, 97, 114, 108, 105, 101, 64, 100, 111, 109, 97, 105, 110, 46, 99, 111, 109, 53, 0, 0, 0, 0, 5, 36,
+ 46, 100, 97, 121, 9, 12, 7, 116, 117, 101, 115, 100, 97, 121, 2, 16, 36, 46, 102, 97, 118, 111, 114, 105, 116, 101, 95, 99, 111, 108, 111, 114,
+ 1, 7, 36, 46, 104, 111, 98, 98, 121, 8, 12, 6, 115, 107, 105, 105, 110, 103,
+ },
+ numRows: 1,
+ want: "JSON_INSERT(JSON_REMOVE(JSON_REPLACE(%s, _utf8mb4'$.day', CAST(JSON_QUOTE(_utf8mb4'tuesday') as JSON)), _utf8mb4'$.favorite_color'), _utf8mb4'$.hobby', CAST(JSON_QUOTE(_utf8mb4'skiing') as JSON))",
+ },
+ {
+ name: "REPLACE with null",
+ // The mysqlbinlog -vvv --base64-output=decode-rows output for the following event:
+ // ### UPDATE `vt_commerce`.`customer`
+ // ### WHERE
+ // ### @1=4 /* LONGINT meta=0 nullable=0 is_null=0 */
+ // ### @2='dan@domain.com' /* VARSTRING(128) meta=128 nullable=1 is_null=0 */
+ // ### @3='{"role": "manager", "salary": 99}' /* JSON meta=4 nullable=1 is_null=0 */
+ // ### SET
+ // ### @1=4 /* LONGINT meta=0 nullable=0 is_null=0 */
+ // ### @2='dan@domain.com' /* VARSTRING(128) meta=128 nullable=1 is_null=0 */
+ // ### @3=JSON_REPLACE(@3, '$.salary', null) /* JSON meta=4 nullable=1 is_null=0 *
+ rawEvent: []byte{
+ 148, 26, 87, 103, 39, 47, 142, 143, 12, 144, 0, 0, 0, 158, 118, 0, 0, 0, 0, 176, 0, 0, 0, 0, 0, 1, 0, 2, 0, 3, 255, 255, 0, 4, 0, 0, 0, 0, 0, 0, 0,
+ 14, 100, 97, 110, 64, 100, 111, 109, 97, 105, 110, 46, 99, 111, 109, 37, 0, 0, 0, 0, 2, 0, 36, 0, 18, 0, 4, 0, 22, 0, 6, 0, 12, 28, 0, 5, 99, 0,
+ 114, 111, 108, 101, 115, 97, 108, 97, 114, 121, 7, 109, 97, 110, 97, 103, 101, 114, 1, 1, 0, 4, 0, 0, 0, 0, 0, 0, 0, 14, 100, 97, 110, 64, 100, 111,
+ 109, 97, 105, 110, 46, 99, 111, 109, 13, 0, 0, 0, 0, 8, 36, 46, 115, 97, 108, 97, 114, 121, 2, 4, 0,
+ },
+ numRows: 1,
+ want: "JSON_REPLACE(%s, _utf8mb4'$.salary', CAST(_utf8mb4'null' as JSON))",
+ },
+ {
+ name: "REPLACE 2 paths",
+ // The mysqlbinlog -vvv --base64-output=decode-rows output for the following event:
+ // ### UPDATE `vt_commerce`.`customer`
+ // ### WHERE
+ // ### @1=4 /* LONGINT meta=0 nullable=0 is_null=0 */
+ // ### @2='dan@domain.com' /* VARSTRING(128) meta=128 nullable=1 is_null=0 */
+ // ### @3='{"role": "manager", "salary": null}' /* JSON meta=4 nullable=1 is_null=0 */
+ // ### SET
+ // ### @1=4 /* LONGINT meta=0 nullable=0 is_null=0 */
+ // ### @2='dan@domain.com' /* VARSTRING(128) meta=128 nullable=1 is_null=0 */
+ // ### @3=JSON_REPLACE(@3, '$.salary', 110,
+ // ### '$.role', 'IC') /* JSON meta=4 nullable=1 is_null=0 */
+ rawEvent: []byte{
+ 32, 32, 87, 103, 39, 26, 45, 78, 117, 158, 0, 0, 0, 145, 106, 0, 0, 0, 0, 176, 0, 0, 0, 0, 0, 1, 0, 2, 0, 3, 255, 255, 0, 4, 0, 0, 0, 0, 0, 0, 0, 14,
+ 100, 97, 110, 64, 100, 111, 109, 97, 105, 110, 46, 99, 111, 109, 37, 0, 0, 0, 0, 2, 0, 36, 0, 18, 0, 4, 0, 22, 0, 6, 0, 12, 28, 0, 5, 99, 0, 114, 111,
+ 108, 101, 115, 97, 108, 97, 114, 121, 7, 109, 97, 110, 97, 103, 101, 114, 1, 1, 0, 4, 0, 0, 0, 0, 0, 0, 0, 14, 100, 97, 110, 64, 100, 111, 109, 97,
+ 105, 110, 46, 99, 111, 109, 27, 0, 0, 0, 0, 8, 36, 46, 115, 97, 108, 97, 114, 121, 3, 5, 110, 0, 0, 6, 36, 46, 114, 111, 108, 101, 4, 12, 2, 73, 67,
+ },
+ numRows: 1,
+ want: "JSON_REPLACE(JSON_REPLACE(%s, _utf8mb4'$.salary', CAST(110 as JSON)), _utf8mb4'$.role', CAST(JSON_QUOTE(_utf8mb4'IC') as JSON))",
+ },
+ {
+ name: "JSON null",
+ // The mysqlbinlog -vvv --base64-output=decode-rows output for the following event:
+ // ### UPDATE `vt_commerce`.`customer`
+ // ### WHERE
+ // ### @1=5 /* LONGINT meta=0 nullable=0 is_null=0 */
+ // ### @2='neweve@domain.com' /* VARSTRING(128) meta=128 nullable=1 is_null=0 */
+ // ### @3='{"day": "friday", "role": "manager", "color": "red", "salary": 100, "favorite_color": "black"}' /* JSON meta=4 nullable=1 is_null=0 */
+ // ### SET
+ // ### @1=5 /* LONGINT meta=0 nullable=0 is_null=0 */
+ // ### @2='neweve@domain.com' /* VARSTRING(128) meta=128 nullable=1 is_null=0 */
+ // ### @3='null' /* JSON meta=4 nullable=1 is_null=0 */
+ rawEvent: []byte{
+ 109, 200, 88, 103, 39, 57, 91, 186, 0, 194, 0, 0, 0, 0, 0, 0, 0, 0, 0, 178, 0, 0, 0, 0, 0, 1, 0, 2, 0, 3, 7, 7, 0, 5, 0, 0, 0, 0, 0, 0, 0, 17, 110,
+ 101, 119, 101, 118, 101, 64, 100, 111, 109, 97, 105, 110, 46, 99, 111, 109, 97, 0, 0, 0, 0, 5, 0, 96, 0, 39, 0, 3, 0, 42, 0, 4, 0, 46, 0, 5, 0, 51,
+ 0, 6, 0, 57, 0, 14, 0, 12, 71, 0, 12, 78, 0, 12, 86, 0, 5, 100, 0, 12, 90, 0, 100, 97, 121, 114, 111, 108, 101, 99, 111, 108, 111, 114, 115, 97,
+ 108, 97, 114, 121, 102, 97, 118, 111, 114, 105, 116, 101, 95, 99, 111, 108, 111, 114, 6, 102, 114, 105, 100, 97, 121, 7, 109, 97, 110, 97, 103, 101,
+ 114, 3, 114, 101, 100, 5, 98, 108, 97, 99, 107, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 17, 110, 101, 119, 101, 118, 101, 64, 100, 111, 109, 97, 105, 110, 46,
+ 99, 111, 109, 2, 0, 0, 0, 4, 0,
+ },
+ numRows: 1,
+ want: "null",
+ },
+ {
+ name: "null literal string",
+ // The mysqlbinlog -vvv --base64-output=decode-rows output for the following event:
+ // ### UPDATE `vt_commerce`.`customer`
+ // ### WHERE
+ // ### @1=10 /* LONGINT meta=0 nullable=0 is_null=0 */
+ // ### @2='mlord@planetscale.com' /* VARSTRING(128) meta=128 nullable=1 is_null=0 */
+ // ### @3=NULL /* JSON meta=4 nullable=1 is_null=1 */
+ // ### SET
+ // ### @1=10 /* LONGINT meta=0 nullable=0 is_null=0 */
+ // ### @2='mlord@planetscale.com' /* VARSTRING(128) meta=128 nullable=1 is_null=0 */
+ // ### @3='null' /* JSON meta=4 nullable=1 is_null=0 */
+ rawEvent: []byte{
+ 178, 168, 89, 103, 39, 37, 191, 137, 18, 105, 0, 0, 0, 0, 0, 0, 0, 0, 0, 153, 0, 0, 0, 0, 0, 1, 0, 2, 0, 3, 7, 7, 4, 10, 0, 0, 0, 0, 0, 0, 0, 21,
+ 109, 108, 111, 114, 100, 64, 112, 108, 97, 110, 101, 116, 115, 99, 97, 108, 101, 46, 99, 111, 109, 0, 0, 10, 0, 0, 0, 0, 0, 0, 0, 21, 109, 108, 111,
+ 114, 100, 64, 112, 108, 97, 110, 101, 116, 115, 99, 97, 108, 101, 46, 99, 111, 109, 6, 0, 0, 0, 12, 4, 110, 117, 108, 108,
+ },
+ numRows: 1,
+ want: "\"null\"",
+ },
+ {
+ name: "JSON object",
+ // The mysqlbinlog -vvv --base64-output=decode-rows output for the following event:
+ // ### UPDATE `vt_commerce`.`customer`
+ // ### WHERE
+ // ### @1=1 /* LONGINT meta=0 nullable=0 is_null=0 */
+ // ### @2='newalice@domain.com' /* VARSTRING(128) meta=128 nullable=1 is_null=0 */
+ // ### @3='{"day": "wednesday", "role": "manager", "color": "red", "salary": 100}' /* JSON meta=4 nullable=1 is_null=0 */
+ // ### SET
+ // ### @1=1 /* LONGINT meta=0 nullable=0 is_null=0 */
+ // ### @2='newalice@domain.com' /* VARSTRING(128) meta=128 nullable=1 is_null=0 */
+ // ### @3=JSON_INSERT(@3, '$.misc', '{"address":"1012 S Park", "town":"Hastings", "state":"MI"}') /* JSON meta=4 nullable=1 is_null=0 */
+ rawEvent: []byte{
+ 208, 160, 89, 103, 39, 202, 59, 214, 68, 242, 0, 0, 0, 0, 0, 0, 0, 0, 0, 153, 0, 0, 0, 0, 0, 1, 0, 2, 0, 3, 7, 7, 0, 1, 0, 0, 0, 0, 0, 0, 0, 19, 110,
+ 101, 119, 97, 108, 105, 99, 101, 64, 100, 111, 109, 97, 105, 110, 46, 99, 111, 109, 73, 0, 0, 0, 0, 4, 0, 72, 0, 32, 0, 3, 0, 35, 0, 4, 0, 39, 0, 5,
+ 0, 44, 0, 6, 0, 12, 50, 0, 12, 60, 0, 12, 68, 0, 5, 100, 0, 100, 97, 121, 114, 111, 108, 101, 99, 111, 108, 111, 114, 115, 97, 108, 97, 114, 121, 9,
+ 119, 101, 100, 110, 101, 115, 100, 97, 121, 7, 109, 97, 110, 97, 103, 101, 114, 3, 114, 101, 100, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 19, 110, 101, 119,
+ 97, 108, 105, 99, 101, 64, 100, 111, 109, 97, 105, 110, 46, 99, 111, 109, 69, 0, 0, 0, 1, 6, 36, 46, 109, 105, 115, 99, 60, 12, 58, 123, 34, 97, 100,
+ 100, 114, 101, 115, 115, 34, 58, 34, 49, 48, 49, 50, 32, 83, 32, 80, 97, 114, 107, 34, 44, 32, 34, 116, 111, 119, 110, 34, 58, 34, 72, 97, 115, 116,
+ 105, 110, 103, 115, 34, 44, 32, 34, 115, 116, 97, 116, 101, 34, 58, 34, 77, 73, 34, 125,
+ },
+ numRows: 1,
+ want: "JSON_INSERT(%s, _utf8mb4'$.misc', CAST(JSON_QUOTE(_utf8mb4'{\"address\":\"1012 S Park\", \"town\":\"Hastings\", \"state\":\"MI\"}') as JSON))",
+ },
+ {
+ name: "JSON field not updated",
+ // The mysqlbinlog -vvv --base64-output=decode-rows output for the following event:
+ // ### UPDATE `vt_commerce`.`customer`
+ // ### WHERE
+ // ### @1=1 /* LONGINT meta=0 nullable=0 is_null=0 */
+ // ### @2='newalice@domain.com' /* VARSTRING(128) meta=128 nullable=1 is_null=0 */
+ // ### @3='{"day": "friday", "role": "manager", "color": "red", "salary": 100, "favorite_color": "black"}' /* JSON meta=4 nullable=1 is_null=0 */
+ // ### SET
+ // ### @1=101 /* LONGINT meta=0 nullable=0 is_null=0 */
+ // ### @2='newalice@domain.com' /* VARSTRING(128) meta=128 nullable=1 is_null=0 */
+ // ### @3=@3 /* JSON meta=4 nullable=1 is_null=0 */
+ // ### UPDATE `vt_commerce`.`customer`
+ // ### WHERE
+ // ### @1=2 /* LONGINT meta=0 nullable=0 is_null=0 */
+ // ### @2='newbob@domain.com' /* VARSTRING(128) meta=128 nullable=1 is_null=0 */
+ // ### @3='{"day": "friday", "role": "manager", "color": "red", "salary": 99, "favorite_color": "black"}' /* JSON meta=4 nullable=1 is_null=0 */
+ // ### SET
+ // ### @1=102 /* LONGINT meta=0 nullable=0 is_null=0 */
+ // ### @2='newbob@domain.com' /* VARSTRING(128) meta=128 nullable=1 is_null=0 */
+ // ### @3=@3 /* JSON meta=4 nullable=1 is_null=0 */
+ // ### UPDATE `vt_commerce`.`customer`
+ // ### WHERE
+ // ### @1=3 /* LONGINT meta=0 nullable=0 is_null=0 */
+ // ### @2='newcharlie@domain.com' /* VARSTRING(128) meta=128 nullable=1 is_null=0 */
+ // ### @3='{"day": "monday", "role": "manager", "color": "red", "hobby": "skiing", "salary": 99}' /* JSON meta=4 nullable=1 is_null=0 */
+ // ### SET
+ // ### @1=103 /* LONGINT meta=0 nullable=0 is_null=0 */
+ // ### @2='newcharlie@domain.com' /* VARSTRING(128) meta=128 nullable=1 is_null=0 */
+ // ### @3=@3 /* JSON meta=4 nullable=1 is_null=0 */
+ // ### UPDATE `vt_commerce`.`customer`
+ // ### WHERE
+ // ### @1=4 /* LONGINT meta=0 nullable=0 is_null=0 */
+ // ### @2='newdan@domain.com' /* VARSTRING(128) meta=128 nullable=1 is_null=0 */
+ // ### @3='{"day": "friday", "role": "manager", "color": "red", "salary": 99, "favorite_color": "black"}' /* JSON meta=4 nullable=1 is_null=0 */
+ // ### SET
+ // ### @1=104 /* LONGINT meta=0 nullable=0 is_null=0 */
+ // ### @2='newdan@domain.com' /* VARSTRING(128) meta=128 nullable=1 is_null=0 */
+ // ### @3=@3 /* JSON meta=4 nullable=1 is_null=0 */
+ // ### UPDATE `vt_commerce`.`customer`
+ // ### WHERE
+ // ### @1=5 /* LONGINT meta=0 nullable=0 is_null=0 */
+ // ### @2='neweve@domain.com' /* VARSTRING(128) meta=128 nullable=1 is_null=0 */
+ // ### @3='{"day": "friday", "role": "manager", "color": "red", "salary": 100, "favorite_color": "black"}' /* JSON meta=4 nullable=1 is_null=0 */
+ // ### SET
+ // ### @1=105 /* LONGINT meta=0 nullable=0 is_null=0 */
+ // ### @2='neweve@domain.com' /* VARSTRING(128) meta=128 nullable=1 is_null=0 */
+ // ### @3=@3 /* JSON meta=4 nullable=1 is_null=0 */
+ rawEvent: []byte{
+ 194, 74, 100, 103, 39, 46, 144, 133, 54, 77, 3, 0, 0, 77, 128, 0, 0, 0, 0, 153, 0, 0, 0, 0, 0, 1, 0, 2, 0, 3, 255, 255, 0, 1, 0, 0, 0, 0, 0, 0, 0,
+ 19, 110, 101, 119, 97, 108, 105, 99, 101, 64, 100, 111, 109, 97, 105, 110, 46, 99, 111, 109, 97, 0, 0, 0, 0, 5, 0, 96, 0, 39, 0, 3, 0, 42, 0, 4, 0,
+ 46, 0, 5, 0, 51, 0, 6, 0, 57, 0, 14, 0, 12, 71, 0, 12, 78, 0, 12, 86, 0, 5, 100, 0, 12, 90, 0, 100, 97, 121, 114, 111, 108, 101, 99, 111, 108, 111,
+ 114, 115, 97, 108, 97, 114, 121, 102, 97, 118, 111, 114, 105, 116, 101, 95, 99, 111, 108, 111, 114, 6, 102, 114, 105, 100, 97, 121, 7, 109, 97,
+ 110, 97, 103, 101, 114, 3, 114, 101, 100, 5, 98, 108, 97, 99, 107, 1, 1, 0, 101, 0, 0, 0, 0, 0, 0, 0, 19, 110, 101, 119, 97, 108, 105, 99, 101, 64,
+ 100, 111, 109, 97, 105, 110, 46, 99, 111, 109, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 17, 110, 101, 119, 98, 111, 98, 64, 100, 111, 109, 97, 105,
+ 110, 46, 99, 111, 109, 97, 0, 0, 0, 0, 5, 0, 96, 0, 39, 0, 3, 0, 42, 0, 4, 0, 46, 0, 5, 0, 51, 0, 6, 0, 57, 0, 14, 0, 12, 71, 0, 12, 78, 0, 12, 86,
+ 0, 5, 99, 0, 12, 90, 0, 100, 97, 121, 114, 111, 108, 101, 99, 111, 108, 111, 114, 115, 97, 108, 97, 114, 121, 102, 97, 118, 111, 114, 105, 116, 101,
+ 95, 99, 111, 108, 111, 114, 6, 102, 114, 105, 100, 97, 121, 7, 109, 97, 110, 97, 103, 101, 114, 3, 114, 101, 100, 5, 98, 108, 97, 99, 107, 1, 1, 0,
+ 102, 0, 0, 0, 0, 0, 0, 0, 17, 110, 101, 119, 98, 111, 98, 64, 100, 111, 109, 97, 105, 110, 46, 99, 111, 109, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0,
+ 21, 110, 101, 119, 99, 104, 97, 114, 108, 105, 101, 64, 100, 111, 109, 97, 105, 110, 46, 99, 111, 109, 89, 0, 0, 0, 0, 5, 0, 88, 0, 39, 0, 3, 0, 42,
+ 0, 4, 0, 46, 0, 5, 0, 51, 0, 5, 0, 56, 0, 6, 0, 12, 62, 0, 12, 69, 0, 12, 77, 0, 12, 81, 0, 5, 99, 0, 100, 97, 121, 114, 111, 108, 101, 99, 111, 108,
+ 111, 114, 104, 111, 98, 98, 121, 115, 97, 108, 97, 114, 121, 6, 109, 111, 110, 100, 97, 121, 7, 109, 97, 110, 97, 103, 101, 114, 3, 114, 101, 100, 6,
+ 115, 107, 105, 105, 110, 103, 1, 1, 0, 103, 0, 0, 0, 0, 0, 0, 0, 21, 110, 101, 119, 99, 104, 97, 114, 108, 105, 101, 64, 100, 111, 109, 97, 105, 110,
+ 46, 99, 111, 109, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 17, 110, 101, 119, 100, 97, 110, 64, 100, 111, 109, 97, 105, 110, 46, 99, 111, 109, 97, 0,
+ 0, 0, 0, 5, 0, 96, 0, 39, 0, 3, 0, 42, 0, 4, 0, 46, 0, 5, 0, 51, 0, 6, 0, 57, 0, 14, 0, 12, 71, 0, 12, 78, 0, 12, 86, 0, 5, 99, 0, 12, 90, 0, 100,
+ 97, 121, 114, 111, 108, 101, 99, 111, 108, 111, 114, 115, 97, 108, 97, 114, 121, 102, 97, 118, 111, 114, 105, 116, 101, 95, 99, 111, 108, 111, 114,
+ 6, 102, 114, 105, 100, 97, 121, 7, 109, 97, 110, 97, 103, 101, 114, 3, 114, 101, 100, 5, 98, 108, 97, 99, 107, 1, 1, 0, 104, 0, 0, 0, 0, 0, 0, 0, 17,
+ 110, 101, 119, 100, 97, 110, 64, 100, 111, 109, 97, 105, 110, 46, 99, 111, 109, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 17, 110, 101, 119, 101, 118,
+ 101, 64, 100, 111, 109, 97, 105, 110, 46, 99, 111, 109, 97, 0, 0, 0, 0, 5, 0, 96, 0, 39, 0, 3, 0, 42, 0, 4, 0, 46, 0, 5, 0, 51, 0, 6, 0, 57, 0, 14,
+ 0, 12, 71, 0, 12, 78, 0, 12, 86, 0, 5, 100, 0, 12, 90, 0, 100, 97, 121, 114, 111, 108, 101, 99, 111, 108, 111, 114, 115, 97, 108, 97, 114, 121, 102,
+ 97, 118, 111, 114, 105, 116, 101, 95, 99, 111, 108, 111, 114, 6, 102, 114, 105, 100, 97, 121, 7, 109, 97, 110, 97, 103, 101, 114, 3, 114, 101, 100,
+ 5, 98, 108, 97, 99, 107, 1, 1, 0, 105, 0, 0, 0, 0, 0, 0, 0, 17, 110, 101, 119, 101, 118, 101, 64, 100, 111, 109, 97, 105, 110, 46, 99, 111, 109, 0,
+ 0, 0, 0,
+ },
+ numRows: 5,
+ want: "",
+ },
+ }
+
+ for _, tc := range testCases {
+ t.Run(tc.name, func(t *testing.T) {
+ mysql56PartialUpdateRowEvent := NewMysql56BinlogEvent(tc.rawEvent)
+ require.True(t, mysql56PartialUpdateRowEvent.IsPartialUpdateRows())
+
+ ev, err := mysql56PartialUpdateRowEvent.Rows(format, tm)
+ require.NoError(t, err)
+
+ assert.Equal(t, tc.numRows, len(ev.Rows))
+ require.NoError(t, err)
+
+ for i := range ev.Rows {
+ vals, err := ev.StringValuesForTests(tm, i)
+ require.NoError(t, err)
+ // The third column is the JSON column.
+ require.Equal(t, tc.want, vals[2])
+ t.Logf("Rows: %v", vals)
+ }
+ })
+ }
+}
diff --git a/go/mysql/binlog_event_rbr.go b/go/mysql/binlog_event_rbr.go
index d77b7bcb9a0..29e0211bc36 100644
--- a/go/mysql/binlog_event_rbr.go
+++ b/go/mysql/binlog_event_rbr.go
@@ -283,10 +283,10 @@ func readColumnCollationIDs(data []byte, pos, count int) ([]collations.ID, error
func (ev binlogEvent) Rows(f BinlogFormat, tm *TableMap) (Rows, error) {
typ := ev.Type()
data := ev.Bytes()[f.HeaderLength:]
- hasIdentify := typ == eUpdateRowsEventV1 || typ == eUpdateRowsEventV2 ||
+ hasIdentify := typ == eUpdateRowsEventV1 || typ == eUpdateRowsEventV2 || typ == ePartialUpdateRowsEvent ||
typ == eDeleteRowsEventV1 || typ == eDeleteRowsEventV2
hasData := typ == eWriteRowsEventV1 || typ == eWriteRowsEventV2 ||
- typ == eUpdateRowsEventV1 || typ == eUpdateRowsEventV2
+ typ == eUpdateRowsEventV1 || typ == ePartialUpdateRowsEvent || typ == eUpdateRowsEventV2
result := Rows{}
pos := 6
@@ -297,7 +297,7 @@ func (ev binlogEvent) Rows(f BinlogFormat, tm *TableMap) (Rows, error) {
pos += 2
// version=2 have extra data here.
- if typ == eWriteRowsEventV2 || typ == eUpdateRowsEventV2 || typ == eDeleteRowsEventV2 {
+ if typ == eWriteRowsEventV2 || typ == eUpdateRowsEventV2 || typ == ePartialUpdateRowsEvent || typ == eDeleteRowsEventV2 {
// This extraDataLength contains the 2 bytes length.
extraDataLength := binary.LittleEndian.Uint16(data[pos : pos+2])
pos += int(extraDataLength)
@@ -311,6 +311,7 @@ func (ev binlogEvent) Rows(f BinlogFormat, tm *TableMap) (Rows, error) {
numIdentifyColumns := 0
numDataColumns := 0
+ numJSONColumns := 0
if hasIdentify {
// Bitmap of the columns used for identify.
@@ -324,6 +325,15 @@ func (ev binlogEvent) Rows(f BinlogFormat, tm *TableMap) (Rows, error) {
numDataColumns = result.DataColumns.BitCount()
}
+ // For PartialUpdateRowsEvents, we need to know how many JSON columns there are.
+ if ev.Type() == ePartialUpdateRowsEvent {
+ for c := 0; c < int(columnCount); c++ {
+ if tm.Types[c] == binlog.TypeJSON {
+ numJSONColumns++
+ }
+ }
+ }
+
// One row at a time.
for pos < len(data) {
row := Row{}
@@ -358,6 +368,17 @@ func (ev binlogEvent) Rows(f BinlogFormat, tm *TableMap) (Rows, error) {
row.Identify = data[startPos:pos]
}
+ if ev.Type() == ePartialUpdateRowsEvent {
+ // The first byte indicates whether or not any JSON values are partial.
+ // If it's not 1 then there's nothing special to do for the row as any
+ // columns use the full value.
+ partialJSON := uint8(data[pos])
+ pos++
+ if partialJSON == 1 {
+ row.JSONPartialValues, pos = newBitmap(data, pos, numJSONColumns)
+ }
+ }
+
if hasData {
// Bitmap of columns that are null (amongst the ones that are present).
row.NullColumns, pos = newBitmap(data, pos, numDataColumns)
@@ -402,6 +423,7 @@ func (rs *Rows) StringValuesForTests(tm *TableMap, rowIndex int) ([]string, erro
var result []string
valueIndex := 0
+ jsonIndex := 0
data := rs.Rows[rowIndex].Data
pos := 0
for c := 0; c < rs.DataColumns.Count(); c++ {
@@ -413,15 +435,24 @@ func (rs *Rows) StringValuesForTests(tm *TableMap, rowIndex int) ([]string, erro
// This column is represented, but its value is NULL.
result = append(result, "NULL")
valueIndex++
+ if tm.Types[c] == binlog.TypeJSON {
+ jsonIndex++
+ }
continue
}
- // We have real data
- value, l, err := binlog.CellValue(data, pos, tm.Types[c], tm.Metadata[c], &querypb.Field{Type: querypb.Type_UINT64})
+ partialJSON := false
+ if rs.Rows[rowIndex].JSONPartialValues.Count() > 0 && tm.Types[c] == binlog.TypeJSON {
+ partialJSON = rs.Rows[rowIndex].JSONPartialValues.Bit(jsonIndex)
+ jsonIndex++
+ }
+
+ // We have real data.
+ value, l, err := binlog.CellValue(data, pos, tm.Types[c], tm.Metadata[c], &querypb.Field{Type: querypb.Type_UINT64}, partialJSON)
if err != nil {
return nil, err
}
- result = append(result, value.ToString())
+ result = append(result, value.RawStr())
pos += l
valueIndex++
}
@@ -452,7 +483,7 @@ func (rs *Rows) StringIdentifiesForTests(tm *TableMap, rowIndex int) ([]string,
}
// We have real data
- value, l, err := binlog.CellValue(data, pos, tm.Types[c], tm.Metadata[c], &querypb.Field{Type: querypb.Type_UINT64})
+ value, l, err := binlog.CellValue(data, pos, tm.Types[c], tm.Metadata[c], &querypb.Field{Type: querypb.Type_UINT64}, false)
if err != nil {
return nil, err
}
diff --git a/go/mysql/conn.go b/go/mysql/conn.go
index d4f870e660f..7eedc094c1e 100644
--- a/go/mysql/conn.go
+++ b/go/mysql/conn.go
@@ -399,7 +399,7 @@ func (c *Conn) readHeaderFrom(r io.Reader) (int, error) {
return 0, vterrors.Wrapf(err, "io.ReadFull(header size) failed")
}
- sequence := uint8(c.header[3])
+ sequence := c.header[3]
if sequence != c.sequence {
return 0, vterrors.Errorf(vtrpcpb.Code_INTERNAL, "invalid sequence, expected %v got %v", c.sequence, sequence)
}
diff --git a/go/mysql/datetime/spec.go b/go/mysql/datetime/spec.go
index ce19126ce55..fe6b1521e43 100644
--- a/go/mysql/datetime/spec.go
+++ b/go/mysql/datetime/spec.go
@@ -359,10 +359,7 @@ func (t2 fmtFullTime24) parse(t *timeparts, bytes string) (string, bool) {
type fmtWeek0 struct{}
func (fmtWeek0) format(dst []byte, t DateTime, prec uint8) []byte {
- year, week := t.Date.SundayWeek()
- if year < t.Date.Year() {
- week = 0
- }
+ week := t.Date.Week(0)
return appendInt(dst, week, 2)
}
@@ -374,10 +371,7 @@ func (u fmtWeek0) parse(t *timeparts, bytes string) (string, bool) {
type fmtWeek1 struct{}
func (fmtWeek1) format(dst []byte, t DateTime, prec uint8) []byte {
- year, week := t.Date.ISOWeek()
- if year < t.Date.Year() {
- week = 0
- }
+ week := t.Date.Week(1)
return appendInt(dst, week, 2)
}
@@ -389,7 +383,7 @@ func (u fmtWeek1) parse(t *timeparts, bytes string) (string, bool) {
type fmtWeek2 struct{}
func (fmtWeek2) format(dst []byte, t DateTime, prec uint8) []byte {
- _, week := t.Date.SundayWeek()
+ week := t.Date.Week(2)
return appendInt(dst, week, 2)
}
@@ -401,7 +395,7 @@ func (v fmtWeek2) parse(t *timeparts, bytes string) (string, bool) {
type fmtWeek3 struct{}
func (fmtWeek3) format(dst []byte, t DateTime, prec uint8) []byte {
- _, week := t.Date.ISOWeek()
+ week := t.Date.Week(3)
return appendInt(dst, week, 2)
}
diff --git a/go/mysql/endtoend/replication_test.go b/go/mysql/endtoend/replication_test.go
index d3b9a6722ea..a04f75c6b43 100644
--- a/go/mysql/endtoend/replication_test.go
+++ b/go/mysql/endtoend/replication_test.go
@@ -1064,7 +1064,7 @@ func valuesForTests(t *testing.T, rs *mysql.Rows, tm *mysql.TableMap, rowIndex i
}
// We have real data
- value, l, err := binlog.CellValue(data, pos, tm.Types[c], tm.Metadata[c], &querypb.Field{Type: querypb.Type_UINT64})
+ value, l, err := binlog.CellValue(data, pos, tm.Types[c], tm.Metadata[c], &querypb.Field{Type: querypb.Type_UINT64}, false)
if err != nil {
return nil, err
}
diff --git a/go/mysql/flavor_filepos.go b/go/mysql/flavor_filepos.go
index 03d745468be..43278c9a0c4 100644
--- a/go/mysql/flavor_filepos.go
+++ b/go/mysql/flavor_filepos.go
@@ -84,7 +84,7 @@ func (flv *filePosFlavor) gtidMode(c *Conn) (string, error) {
// serverUUID is part of the Flavor interface.
func (flv *filePosFlavor) serverUUID(c *Conn) (string, error) {
- // keep @@global as lowercase, as some servers like the Ripple binlog server only honors a lowercase `global` value
+ // keep @@global as lowercase, as some servers like a binlog server only honors a lowercase `global` value
qr, err := c.ExecuteFetch("SELECT @@global.server_uuid", 1, false)
if err != nil {
return "", err
diff --git a/go/mysql/flavor_mysql.go b/go/mysql/flavor_mysql.go
index b109e5ca385..e405dc401ec 100644
--- a/go/mysql/flavor_mysql.go
+++ b/go/mysql/flavor_mysql.go
@@ -60,7 +60,7 @@ var _ flavor = (*mysqlFlavor82)(nil)
// primaryGTIDSet is part of the Flavor interface.
func (mysqlFlavor) primaryGTIDSet(c *Conn) (replication.GTIDSet, error) {
- // keep @@global as lowercase, as some servers like the Ripple binlog server only honors a lowercase `global` value
+ // keep @@global as lowercase, as some servers like a binlog server only honors a lowercase `global` value
qr, err := c.ExecuteFetch("SELECT @@global.gtid_executed", 1, false)
if err != nil {
return nil, err
@@ -73,7 +73,7 @@ func (mysqlFlavor) primaryGTIDSet(c *Conn) (replication.GTIDSet, error) {
// purgedGTIDSet is part of the Flavor interface.
func (mysqlFlavor) purgedGTIDSet(c *Conn) (replication.GTIDSet, error) {
- // keep @@global as lowercase, as some servers like the Ripple binlog server only honors a lowercase `global` value
+ // keep @@global as lowercase, as some servers like a binlog server only honors a lowercase `global` value
qr, err := c.ExecuteFetch("SELECT @@global.gtid_purged", 1, false)
if err != nil {
return nil, err
@@ -86,7 +86,7 @@ func (mysqlFlavor) purgedGTIDSet(c *Conn) (replication.GTIDSet, error) {
// serverUUID is part of the Flavor interface.
func (mysqlFlavor) serverUUID(c *Conn) (string, error) {
- // keep @@global as lowercase, as some servers like the Ripple binlog server only honors a lowercase `global` value
+ // keep @@global as lowercase, as some servers like a binlog server only honors a lowercase `global` value
qr, err := c.ExecuteFetch("SELECT @@global.server_uuid", 1, false)
if err != nil {
return "", err
diff --git a/go/mysql/query.go b/go/mysql/query.go
index 26582cecbd9..720a533a772 100644
--- a/go/mysql/query.go
+++ b/go/mysql/query.go
@@ -404,6 +404,7 @@ func (c *Conn) ReadQueryResult(maxrows int, wantfields bool) (*sqltypes.Result,
return &sqltypes.Result{
RowsAffected: packetOk.affectedRows,
InsertID: packetOk.lastInsertID,
+ InsertIDChanged: packetOk.lastInsertID > 0,
SessionStateChanges: packetOk.sessionStateData,
StatusFlags: packetOk.statusFlags,
Info: packetOk.info,
diff --git a/go/mysql/query_test.go b/go/mysql/query_test.go
index 6892508ac0c..01cbd6a8f30 100644
--- a/go/mysql/query_test.go
+++ b/go/mysql/query_test.go
@@ -22,17 +22,13 @@ import (
"sync"
"testing"
- "google.golang.org/protobuf/proto"
-
- "vitess.io/vitess/go/mysql/sqlerror"
-
- "vitess.io/vitess/go/mysql/collations"
-
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
+ "google.golang.org/protobuf/proto"
+ "vitess.io/vitess/go/mysql/collations"
+ "vitess.io/vitess/go/mysql/sqlerror"
"vitess.io/vitess/go/sqltypes"
-
querypb "vitess.io/vitess/go/vt/proto/query"
)
@@ -393,8 +389,9 @@ func TestQueries(t *testing.T) {
// Typical Insert result
checkQuery(t, "insert", sConn, cConn, &sqltypes.Result{
- RowsAffected: 0x8010203040506070,
- InsertID: 0x0102030405060708,
+ RowsAffected: 0x8010203040506070,
+ InsertID: 0x0102030405060708,
+ InsertIDChanged: true,
})
// Typical Select with TYPE_AND_NAME.
@@ -702,6 +699,7 @@ func checkQueryInternal(t *testing.T, query string, sConn, cConn *Conn, result *
got = &sqltypes.Result{}
got.RowsAffected = result.RowsAffected
got.InsertID = result.InsertID
+ got.InsertIDChanged = result.InsertIDUpdated()
got.Fields, err = cConn.Fields()
if err != nil {
fatalError = fmt.Sprintf("Fields(%v) failed: %v", query, err)
diff --git a/go/mysql/replication_constants.go b/go/mysql/replication_constants.go
index 6b6e34b2333..27d0bd331ce 100644
--- a/go/mysql/replication_constants.go
+++ b/go/mysql/replication_constants.go
@@ -110,6 +110,9 @@ const (
//eViewChangeEvent = 37
//eXAPrepareLogEvent = 38
+ // PartialUpdateRowsEvent when binlog_row_value_options=PARTIAL_JSON.
+ ePartialUpdateRowsEvent = 39
+
// Transaction_payload_event when binlog_transaction_compression=ON.
eTransactionPayloadEvent = 40
diff --git a/go/sqltypes/proto3.go b/go/sqltypes/proto3.go
index 6eaefcf4b0c..0ca03b153cf 100644
--- a/go/sqltypes/proto3.go
+++ b/go/sqltypes/proto3.go
@@ -103,6 +103,7 @@ func ResultToProto3(qr *Result) *querypb.QueryResult {
Fields: qr.Fields,
RowsAffected: qr.RowsAffected,
InsertId: qr.InsertID,
+ InsertIdChanged: qr.InsertIDChanged,
Rows: RowsToProto3(qr.Rows),
Info: qr.Info,
SessionStateChanges: qr.SessionStateChanges,
@@ -119,6 +120,7 @@ func Proto3ToResult(qr *querypb.QueryResult) *Result {
Fields: qr.Fields,
RowsAffected: qr.RowsAffected,
InsertID: qr.InsertId,
+ InsertIDChanged: qr.InsertIdChanged,
Rows: proto3ToRows(qr.Fields, qr.Rows),
Info: qr.Info,
SessionStateChanges: qr.SessionStateChanges,
@@ -136,6 +138,7 @@ func CustomProto3ToResult(fields []*querypb.Field, qr *querypb.QueryResult) *Res
Fields: qr.Fields,
RowsAffected: qr.RowsAffected,
InsertID: qr.InsertId,
+ InsertIDChanged: qr.InsertIdChanged,
Rows: proto3ToRows(fields, qr.Rows),
Info: qr.Info,
SessionStateChanges: qr.SessionStateChanges,
diff --git a/go/sqltypes/proto3_test.go b/go/sqltypes/proto3_test.go
index 5e0bffd2a73..61674b2d1e4 100644
--- a/go/sqltypes/proto3_test.go
+++ b/go/sqltypes/proto3_test.go
@@ -39,9 +39,10 @@ func TestResult(t *testing.T) {
Type: Float64,
}}
sqlResult := &Result{
- Fields: fields,
- InsertID: 1,
- RowsAffected: 2,
+ Fields: fields,
+ InsertID: 1,
+ InsertIDChanged: true,
+ RowsAffected: 2,
Rows: [][]Value{{
TestValue(VarChar, "aa"),
TestValue(Int64, "1"),
@@ -53,9 +54,10 @@ func TestResult(t *testing.T) {
}},
}
p3Result := &querypb.QueryResult{
- Fields: fields,
- InsertId: 1,
- RowsAffected: 2,
+ Fields: fields,
+ InsertId: 1,
+ InsertIdChanged: true,
+ RowsAffected: 2,
Rows: []*querypb.Row{{
Lengths: []int64{2, 1, 1},
Values: []byte("aa12"),
@@ -105,18 +107,20 @@ func TestResults(t *testing.T) {
Type: Float64,
}}
sqlResults := []Result{{
- Fields: fields1,
- InsertID: 1,
- RowsAffected: 2,
+ Fields: fields1,
+ InsertID: 1,
+ InsertIDChanged: true,
+ RowsAffected: 2,
Rows: [][]Value{{
TestValue(VarChar, "aa"),
TestValue(Int64, "1"),
TestValue(Float64, "2"),
}},
}, {
- Fields: fields2,
- InsertID: 3,
- RowsAffected: 4,
+ Fields: fields2,
+ InsertID: 3,
+ InsertIDChanged: true,
+ RowsAffected: 4,
Rows: [][]Value{{
TestValue(VarChar, "bb"),
TestValue(Int64, "3"),
@@ -124,17 +128,19 @@ func TestResults(t *testing.T) {
}},
}}
p3Results := []*querypb.QueryResult{{
- Fields: fields1,
- InsertId: 1,
- RowsAffected: 2,
+ Fields: fields1,
+ InsertId: 1,
+ InsertIdChanged: true,
+ RowsAffected: 2,
Rows: []*querypb.Row{{
Lengths: []int64{2, 1, 1},
Values: []byte("aa12"),
}},
}, {
- Fields: fields2,
- InsertId: 3,
- RowsAffected: 4,
+ Fields: fields2,
+ InsertId: 3,
+ InsertIdChanged: true,
+ RowsAffected: 4,
Rows: []*querypb.Row{{
Lengths: []int64{2, 1, 1},
Values: []byte("bb34"),
@@ -176,9 +182,10 @@ func TestQueryReponses(t *testing.T) {
queryResponses := []QueryResponse{
{
QueryResult: &Result{
- Fields: fields1,
- InsertID: 1,
- RowsAffected: 2,
+ Fields: fields1,
+ InsertID: 1,
+ InsertIDChanged: true,
+ RowsAffected: 2,
Rows: [][]Value{{
TestValue(VarChar, "aa"),
TestValue(Int64, "1"),
@@ -188,9 +195,10 @@ func TestQueryReponses(t *testing.T) {
QueryError: nil,
}, {
QueryResult: &Result{
- Fields: fields2,
- InsertID: 3,
- RowsAffected: 4,
+ Fields: fields2,
+ InsertID: 3,
+ InsertIDChanged: true,
+ RowsAffected: 4,
Rows: [][]Value{{
TestValue(VarChar, "bb"),
TestValue(Int64, "3"),
@@ -208,9 +216,10 @@ func TestQueryReponses(t *testing.T) {
{
Error: nil,
Result: &querypb.QueryResult{
- Fields: fields1,
- InsertId: 1,
- RowsAffected: 2,
+ Fields: fields1,
+ InsertId: 1,
+ InsertIdChanged: true,
+ RowsAffected: 2,
Rows: []*querypb.Row{{
Lengths: []int64{2, 1, 1},
Values: []byte("aa12"),
@@ -219,9 +228,10 @@ func TestQueryReponses(t *testing.T) {
}, {
Error: nil,
Result: &querypb.QueryResult{
- Fields: fields2,
- InsertId: 3,
- RowsAffected: 4,
+ Fields: fields2,
+ InsertId: 3,
+ InsertIdChanged: true,
+ RowsAffected: 4,
Rows: []*querypb.Row{{
Lengths: []int64{2, 1, 1},
Values: []byte("bb34"),
diff --git a/go/sqltypes/result.go b/go/sqltypes/result.go
index 389b7fff620..b3cc0fd5573 100644
--- a/go/sqltypes/result.go
+++ b/go/sqltypes/result.go
@@ -31,6 +31,7 @@ type Result struct {
Fields []*querypb.Field `json:"fields"`
RowsAffected uint64 `json:"rows_affected"`
InsertID uint64 `json:"insert_id"`
+ InsertIDChanged bool `json:"insert_id_changed"`
Rows []Row `json:"rows"`
SessionStateChanges string `json:"session_state_changes"`
StatusFlags uint16 `json:"status_flags"`
@@ -92,6 +93,7 @@ func (result *Result) Copy() *Result {
out := &Result{
RowsAffected: result.RowsAffected,
InsertID: result.InsertID,
+ InsertIDChanged: result.InsertIDChanged,
SessionStateChanges: result.SessionStateChanges,
StatusFlags: result.StatusFlags,
Info: result.Info,
@@ -116,6 +118,7 @@ func (result *Result) ShallowCopy() *Result {
return &Result{
Fields: result.Fields,
InsertID: result.InsertID,
+ InsertIDChanged: result.InsertIDChanged,
RowsAffected: result.RowsAffected,
Info: result.Info,
SessionStateChanges: result.SessionStateChanges,
@@ -129,6 +132,7 @@ func (result *Result) Metadata() *Result {
return &Result{
Fields: result.Fields,
InsertID: result.InsertID,
+ InsertIDChanged: result.InsertIDChanged,
RowsAffected: result.RowsAffected,
Info: result.Info,
SessionStateChanges: result.SessionStateChanges,
@@ -153,6 +157,7 @@ func (result *Result) Truncate(l int) *Result {
out := &Result{
InsertID: result.InsertID,
+ InsertIDChanged: result.InsertIDChanged,
RowsAffected: result.RowsAffected,
Info: result.Info,
SessionStateChanges: result.SessionStateChanges,
@@ -198,6 +203,7 @@ func (result *Result) Equal(other *Result) bool {
return FieldsEqual(result.Fields, other.Fields) &&
result.RowsAffected == other.RowsAffected &&
result.InsertID == other.InsertID &&
+ result.InsertIDChanged == other.InsertIDChanged &&
slices.EqualFunc(result.Rows, other.Rows, func(a, b Row) bool {
return RowEqual(a, b)
})
@@ -324,15 +330,13 @@ func (result *Result) StripMetadata(incl querypb.ExecuteOptions_IncludedFields)
// to another result.Note currently it doesn't handle cases like
// if two results have different fields.We will enhance this function.
func (result *Result) AppendResult(src *Result) {
- if src.RowsAffected == 0 && len(src.Rows) == 0 && len(src.Fields) == 0 {
- return
- }
- if result.Fields == nil {
- result.Fields = src.Fields
- }
result.RowsAffected += src.RowsAffected
- if src.InsertID != 0 {
+ if src.InsertIDUpdated() {
result.InsertID = src.InsertID
+ result.InsertIDChanged = true
+ }
+ if len(result.Fields) == 0 {
+ result.Fields = src.Fields
}
result.Rows = append(result.Rows, src.Rows...)
}
@@ -351,3 +355,7 @@ func (result *Result) IsMoreResultsExists() bool {
func (result *Result) IsInTransaction() bool {
return result.StatusFlags&ServerStatusInTrans == ServerStatusInTrans
}
+
+func (result *Result) InsertIDUpdated() bool {
+ return result.InsertIDChanged || result.InsertID > 0
+}
diff --git a/go/sqltypes/result_test.go b/go/sqltypes/result_test.go
index d8075ec0633..c358497baf3 100644
--- a/go/sqltypes/result_test.go
+++ b/go/sqltypes/result_test.go
@@ -21,11 +21,17 @@ import (
"github.com/stretchr/testify/assert"
- "vitess.io/vitess/go/test/utils"
-
querypb "vitess.io/vitess/go/vt/proto/query"
)
+func assertEqualResults(t *testing.T, a, b *Result) {
+ t.Helper()
+ assert.Truef(t, a.Equal(b), "Results are not equal: \n%v\n%v", a, b)
+ if !a.Equal(b) {
+ t.Errorf("Results are not equal: %v %v", a, b)
+ }
+}
+
func TestRepair(t *testing.T) {
fields := []*querypb.Field{{
Type: Int64,
@@ -45,9 +51,7 @@ func TestRepair(t *testing.T) {
},
}
in.Repair(fields)
- if !in.Equal(want) {
- t.Errorf("Repair:\n%#v, want\n%#v", in, want)
- }
+ assertEqualResults(t, in, want)
}
func TestCopy(t *testing.T) {
@@ -57,8 +61,9 @@ func TestCopy(t *testing.T) {
}, {
Type: VarChar,
}},
- InsertID: 1,
- RowsAffected: 2,
+ InsertID: 1,
+ InsertIDChanged: true,
+ RowsAffected: 2,
Rows: [][]Value{
{TestValue(Int64, "1"), MakeTrusted(Null, nil)},
{TestValue(Int64, "2"), MakeTrusted(VarChar, nil)},
@@ -66,7 +71,7 @@ func TestCopy(t *testing.T) {
},
}
out := in.Copy()
- utils.MustMatch(t, in, out)
+ assertEqualResults(t, in, out)
}
func TestTruncate(t *testing.T) {
@@ -76,8 +81,9 @@ func TestTruncate(t *testing.T) {
}, {
Type: VarChar,
}},
- InsertID: 1,
- RowsAffected: 2,
+ InsertID: 1,
+ InsertIDChanged: true,
+ RowsAffected: 2,
Rows: [][]Value{
{TestValue(Int64, "1"), MakeTrusted(Null, nil)},
{TestValue(Int64, "2"), MakeTrusted(VarChar, nil)},
@@ -86,26 +92,23 @@ func TestTruncate(t *testing.T) {
}
out := in.Truncate(0)
- if !out.Equal(in) {
- t.Errorf("Truncate(0):\n%v, want\n%v", out, in)
- }
+ assertEqualResults(t, in, out)
out = in.Truncate(1)
want := &Result{
Fields: []*querypb.Field{{
Type: Int64,
}},
- InsertID: 1,
- RowsAffected: 2,
+ InsertID: 1,
+ InsertIDChanged: true,
+ RowsAffected: 2,
Rows: [][]Value{
{TestValue(Int64, "1")},
{TestValue(Int64, "2")},
{TestValue(Int64, "3")},
},
}
- if !out.Equal(want) {
- t.Errorf("Truncate(1):\n%v, want\n%v", out, want)
- }
+ assertEqualResults(t, out, want)
}
func TestStripMetaData(t *testing.T) {
@@ -283,9 +286,7 @@ func TestStripMetaData(t *testing.T) {
t.Run(tcase.name, func(t *testing.T) {
inCopy := tcase.in.Copy()
out := inCopy.StripMetadata(tcase.includedFields)
- if !out.Equal(tcase.expected) {
- t.Errorf("StripMetaData unexpected result for %v: %v", tcase.name, out)
- }
+ assertEqualResults(t, out, tcase.expected)
if len(tcase.in.Fields) > 0 {
// check the out array is different than the in array.
if out.Fields[0] == inCopy.Fields[0] && tcase.includedFields != querypb.ExecuteOptions_ALL {
@@ -293,7 +294,7 @@ func TestStripMetaData(t *testing.T) {
}
}
// check we didn't change the original result.
- utils.MustMatch(t, tcase.in, inCopy)
+ assertEqualResults(t, tcase.in, inCopy)
})
}
}
@@ -305,8 +306,9 @@ func TestAppendResult(t *testing.T) {
}, {
Type: VarChar,
}},
- InsertID: 1,
- RowsAffected: 2,
+ InsertIDChanged: true,
+ InsertID: 1,
+ RowsAffected: 2,
Rows: [][]Value{
{TestValue(Int64, "2"), MakeTrusted(VarChar, nil)},
{TestValue(Int64, "3"), TestValue(VarChar, "")},
@@ -319,8 +321,9 @@ func TestAppendResult(t *testing.T) {
}, {
Type: VarChar,
}},
- InsertID: 3,
- RowsAffected: 4,
+ InsertID: 3,
+ InsertIDChanged: true,
+ RowsAffected: 4,
Rows: [][]Value{
{TestValue(Int64, "1"), MakeTrusted(Null, nil)},
},
@@ -332,8 +335,9 @@ func TestAppendResult(t *testing.T) {
}, {
Type: VarChar,
}},
- InsertID: 1,
- RowsAffected: 6,
+ InsertID: 1,
+ InsertIDChanged: true,
+ RowsAffected: 6,
Rows: [][]Value{
{TestValue(Int64, "1"), MakeTrusted(Null, nil)},
{TestValue(Int64, "2"), MakeTrusted(VarChar, nil)},
@@ -342,10 +346,7 @@ func TestAppendResult(t *testing.T) {
}
result.AppendResult(src)
-
- if !result.Equal(want) {
- t.Errorf("Got:\n%#v, want:\n%#v", result, want)
- }
+ assertEqualResults(t, result, want)
}
func TestReplaceKeyspace(t *testing.T) {
diff --git a/go/test/endtoend/recovery/pitr/binlog_server.go b/go/test/endtoend/recovery/pitr/binlog_server.go
deleted file mode 100644
index 3b78b0d4ad7..00000000000
--- a/go/test/endtoend/recovery/pitr/binlog_server.go
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
-Copyright 2020 The Vitess Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package pitr
-
-import (
- "fmt"
- "os"
- "os/exec"
- "path"
- "strings"
- "syscall"
- "time"
-
- "vitess.io/vitess/go/vt/log"
-)
-
-const (
- binlogExecutableName = "rippled"
- binlogDataDir = "binlog_dir"
- binlogUser = "ripple"
- binlogPassword = "ripplepassword"
- binlogPasswordHash = "D4CDF66E273494CEA9592162BEBB6D62D94C4168"
-)
-
-type binLogServer struct {
- hostname string
- port int
- username string
- password string
- passwordHash string
- dataDirectory string
- executablePath string
-
- proc *exec.Cmd
- exit chan error
-}
-
-type mysqlSource struct {
- hostname string
- port int
- username string
- password string
-}
-
-// newBinlogServer returns an instance of binlog server
-func newBinlogServer(hostname string, port int) (*binLogServer, error) {
- dataDir := path.Join(os.Getenv("VTDATAROOT"), fmt.Sprintf("%s_%d", binlogDataDir, port))
- fmt.Println(dataDir)
- if _, err := os.Stat(dataDir); os.IsNotExist(err) {
- err := os.Mkdir(dataDir, 0700)
- if err != nil {
- log.Error(err)
- return nil, err
- }
- }
- return &binLogServer{
- executablePath: path.Join(os.Getenv("EXTRA_BIN"), binlogExecutableName),
- dataDirectory: dataDir,
- username: binlogUser,
- password: binlogPassword,
- passwordHash: binlogPasswordHash,
- hostname: hostname,
- port: port,
- }, nil
-}
-
-// start starts the binlog server points to running mysql port
-func (bs *binLogServer) start(source mysqlSource) error {
- bs.proc = exec.Command(
- bs.executablePath,
- fmt.Sprintf("-ripple_datadir=%s", bs.dataDirectory),
- fmt.Sprintf("-ripple_server_password_hash=%s", bs.passwordHash),
- fmt.Sprintf("-ripple_master_address=%s", source.hostname),
- fmt.Sprintf("-ripple_master_port=%d", source.port),
- fmt.Sprintf("-ripple_master_user=%s", source.username),
- fmt.Sprintf("-ripple_server_ports=%d", bs.port),
- )
- if source.password != "" {
- bs.proc.Args = append(bs.proc.Args, fmt.Sprintf("-ripple_master_password=%s", source.password))
- }
-
- errFile, err := os.Create(path.Join(bs.dataDirectory, "log.txt"))
- if err != nil {
- log.Errorf("cannot create error log file for binlog server: %v", err)
- return err
- }
- bs.proc.Stderr = errFile
-
- bs.proc.Env = append(bs.proc.Env, os.Environ()...)
-
- log.Infof("Running binlog server with command: %v", strings.Join(bs.proc.Args, " "))
-
- err = bs.proc.Start()
- if err != nil {
- return err
- }
- bs.exit = make(chan error)
- go func() {
- if bs.proc != nil {
- bs.exit <- bs.proc.Wait()
- }
- }()
- return nil
-}
-
-func (bs *binLogServer) stop() error {
- if bs.proc == nil || bs.exit == nil {
- return nil
- }
- // Attempt graceful shutdown with SIGTERM first
- bs.proc.Process.Signal(syscall.SIGTERM)
-
- select {
- case err := <-bs.exit:
- bs.proc = nil
- return err
-
- case <-time.After(10 * time.Second):
- bs.proc.Process.Kill()
- bs.proc = nil
- return <-bs.exit
- }
-}
diff --git a/go/test/endtoend/recovery/pitr/shardedpitr_test.go b/go/test/endtoend/recovery/pitr/shardedpitr_test.go
deleted file mode 100644
index 3bb2399737e..00000000000
--- a/go/test/endtoend/recovery/pitr/shardedpitr_test.go
+++ /dev/null
@@ -1,602 +0,0 @@
-/*
-Copyright 2020 The Vitess Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package pitr
-
-import (
- "context"
- "fmt"
- "os"
- "os/exec"
- "path"
- "strings"
- "testing"
- "time"
-
- "github.com/stretchr/testify/assert"
- "github.com/stretchr/testify/require"
-
- "vitess.io/vitess/go/constants/sidecar"
- "vitess.io/vitess/go/json2"
- "vitess.io/vitess/go/mysql"
- "vitess.io/vitess/go/test/endtoend/cluster"
- "vitess.io/vitess/go/test/endtoend/utils"
- "vitess.io/vitess/go/vt/log"
-
- vtctldatapb "vitess.io/vitess/go/vt/proto/vtctldata"
-)
-
-var (
- createTable = `create table product (id bigint(20) primary key, name char(10), created bigint(20));`
- insertTable = `insert into product (id, name, created) values(%d, '%s', unix_timestamp());`
- getCountID = `select count(*) from product`
-)
-
-var (
- clusterInstance *cluster.LocalProcessCluster
-
- primary *cluster.Vttablet
- replica1 *cluster.Vttablet
- replica2 *cluster.Vttablet
- shard0Primary *cluster.Vttablet
- shard0Replica1 *cluster.Vttablet
- shard0Replica2 *cluster.Vttablet
- shard1Primary *cluster.Vttablet
- shard1Replica1 *cluster.Vttablet
- shard1Replica2 *cluster.Vttablet
-
- cell = "zone1"
- hostname = "localhost"
- binlogHost = "127.0.0.1"
- keyspaceName = "ks"
- restoreKS1Name = "restoreks1"
- restoreKS2Name = "restoreks2"
- restoreKS3Name = "restoreks3"
- shardName = "0"
- shard0Name = "-80"
- shard1Name = "80-"
- dbName = "vt_ks"
- mysqlUserName = "vt_dba"
- mysqlPassword = "VtDbaPass"
- dbCredentialFile = ""
- initDBFileWithPassword = ""
- vSchema = `{
- "sharded": true,
- "vindexes": {
- "hash_index": {
- "type": "hash"
- }
- },
- "tables": {
- "product": {
- "column_vindexes": [
- {
- "column": "id",
- "name": "hash_index"
- }
- ]
- }
- }
- }`
- commonTabletArg = []string{
- "--vreplication_retry_delay", "1s",
- "--degraded_threshold", "5s",
- "--lock_tables_timeout", "5s",
- "--watch_replication_stream",
- "--serving_state_grace_period", "1s"}
-
- defaultTimeout = 30 * time.Second
- defaultTick = 1 * time.Second
-)
-
-// Test pitr (Point in time recovery).
-// -------------------------------------------
-// The following test will:
-// - create a shard with primary and replica
-// - run InitShardPrimary
-// - point binlog server to primary
-// - insert some data using vtgate (e.g. here we have inserted rows 1,2)
-// - verify the replication
-// - take backup of replica
-// - insert some data using vtgate (e.g. we inserted rows 3 4 5 6), while inserting row-4, note down the time (restoreTime1)
-// - perform a resharding to create 2 shards (-80, 80-), and delete the old shard
-// - point binlog server to primary of both shards
-// - insert some data using vtgate (e.g. we will insert 7 8 9 10) and verify we get required number of rows in -80, 80- shard
-// - take backup of both shards
-// - insert some more data using vtgate (e.g. we will insert 11 12 13 14 15), while inserting row-13, note down the time (restoreTime2)
-// - note down the current time (restoreTime3)
-
-// - Till now we did all the presetup for assertions
-
-// - asserting that restoring to restoreTime1 (going from 2 shards to 1 shard) is working, i.e. we should get 4 rows.
-// - asserting that while restoring if we give small timeout value, it will restore upto to the last available backup (asserting only -80 shard)
-// - asserting that restoring to restoreTime2 (going from 2 shards to 2 shards with past time) is working, it will assert for both shards
-// - asserting that restoring to restoreTime3 is working, we should get complete data after restoring, as we have in existing shards.
-func TestPITRRecovery(t *testing.T) {
- initializeCluster(t)
- defer clusterInstance.Teardown()
-
- // start the binlog server and point it to primary
- bs := startBinlogServer(t, primary)
- defer bs.stop()
-
- // Creating the table
- _, err := primary.VttabletProcess.QueryTablet(createTable, keyspaceName, true)
- require.NoError(t, err)
-
- insertRow(t, 1, "prd-1", false)
- insertRow(t, 2, "prd-2", false)
-
- cluster.VerifyRowsInTabletForTable(t, replica1, keyspaceName, 2, "product")
-
- // backup the replica
- err = clusterInstance.VtctldClientProcess.ExecuteCommand("Backup", replica1.Alias)
- require.NoError(t, err)
-
- // check that the backup shows up in the listing
- output, err := clusterInstance.ListBackups("ks/0")
- require.NoError(t, err)
- assert.Equal(t, 1, len(output))
-
- // now insert some more data to simulate the changes after regular backup
- // every insert has some time lag/difference to simulate the time gap between rows
- // and when we recover to certain time, this time gap will be able to identify the exact eligible row
- var restoreTime1 string
- for counter := 3; counter <= 6; counter++ {
- if counter == 4 { // we want to recovery till this, so noting the time
- tm := time.Now().Add(1 * time.Second).UTC()
- restoreTime1 = tm.Format(time.RFC3339)
- }
- insertRow(t, counter, fmt.Sprintf("prd-%d", counter), true)
- }
-
- // starting resharding process
- performResharding(t)
-
- // start the binlog server and point it to shard0Primary
- bs0 := startBinlogServer(t, shard0Primary)
- defer bs0.stop()
-
- // start the binlog server and point it to shard1Primary
- bs1 := startBinlogServer(t, shard1Primary)
- defer bs1.stop()
-
- for counter := 7; counter <= 10; counter++ {
- insertRow(t, counter, fmt.Sprintf("prd-%d", counter), false)
- }
-
- // wait till all the shards have required data
- cluster.VerifyRowsInTabletForTable(t, shard0Replica1, keyspaceName, 6, "product")
- cluster.VerifyRowsInTabletForTable(t, shard1Replica1, keyspaceName, 4, "product")
-
- // take the backup (to simulate the regular backup)
- err = clusterInstance.VtctldClientProcess.ExecuteCommand("Backup", shard0Replica1.Alias)
- require.NoError(t, err)
- // take the backup (to simulate the regular backup)
- err = clusterInstance.VtctldClientProcess.ExecuteCommand("Backup", shard1Replica1.Alias)
- require.NoError(t, err)
-
- backups, err := clusterInstance.ListBackups(keyspaceName + "/-80")
- require.NoError(t, err)
- require.Equal(t, len(backups), 1)
-
- backups, err = clusterInstance.ListBackups(keyspaceName + "/80-")
- require.NoError(t, err)
- require.Equal(t, len(backups), 1)
-
- // now insert some more data to simulate the changes after regular backup
- // every insert has some time lag/difference to simulate the time gap between rows
- // and when we recover to certain time, this time gap will be able to identify the exact eligible row
- var restoreTime2 string
- for counter := 11; counter <= 15; counter++ {
- if counter == 13 { // we want to recovery till this, so noting the time
- tm := time.Now().Add(1 * time.Second).UTC()
- restoreTime2 = tm.Format(time.RFC3339)
- }
- insertRow(t, counter, fmt.Sprintf("prd-%d", counter), true)
- }
- restoreTime3 := time.Now().UTC().Format(time.RFC3339)
-
- // creating restore keyspace with snapshot time as restoreTime1
- createRestoreKeyspace(t, restoreTime1, restoreKS1Name)
-
- // Launching a recovery tablet which recovers data from the primary till the restoreTime1
- testTabletRecovery(t, bs, "2m", restoreKS1Name, "0", "INT64(4)")
-
- // create restoreKeyspace with snapshot time as restoreTime2
- createRestoreKeyspace(t, restoreTime2, restoreKS2Name)
-
- // test the recovery with smaller binlog_lookup_timeout for shard0
- // since we have small lookup timeout, it will just get whatever available in the backup
- // mysql> select * from product;
- // +----+--------+------------+
- // | id | name | created |
- // +----+--------+------------+
- // | 1 | prd-1 | 1597219030 |
- // | 2 | prd-2 | 1597219030 |
- // | 3 | prd-3 | 1597219043 |
- // | 5 | prd-5 | 1597219045 |
- // | 9 | prd-9 | 1597219130 |
- // | 10 | prd-10 | 1597219130 |
- // +----+--------+------------+
- testTabletRecovery(t, bs0, "1ms", restoreKS2Name, "-80", "INT64(6)")
-
- // test the recovery with valid binlog_lookup_timeout for shard0 and getting the data till the restoreTime2
- // mysql> select * from product;
- // +----+--------+------------+
- // | id | name | created |
- // +----+--------+------------+
- // | 1 | prd-1 | 1597219030 |
- // | 2 | prd-2 | 1597219030 |
- // | 3 | prd-3 | 1597219043 |
- // | 5 | prd-5 | 1597219045 |
- // | 9 | prd-9 | 1597219130 |
- // | 10 | prd-10 | 1597219130 |
- // | 13 | prd-13 | 1597219141 |
- // +----+--------+------------+
- testTabletRecovery(t, bs0, "2m", restoreKS2Name, "-80", "INT64(7)")
-
- // test the recovery with valid binlog_lookup_timeout for shard1 and getting the data till the restoreTime2
- // mysql> select * from product;
- // +----+--------+------------+
- // | id | name | created |
- // +----+--------+------------+
- // | 4 | prd-4 | 1597219044 |
- // | 6 | prd-6 | 1597219046 |
- // | 7 | prd-7 | 1597219130 |
- // | 8 | prd-8 | 1597219130 |
- // | 11 | prd-11 | 1597219139 |
- // | 12 | prd-12 | 1597219140 |
- // +----+--------+------------+
- testTabletRecovery(t, bs1, "2m", restoreKS2Name, "80-", "INT64(6)")
-
- // test the recovery with timetorecover > (timestmap of last binlog event in binlog server)
- createRestoreKeyspace(t, restoreTime3, restoreKS3Name)
-
- // mysql> select * from product;
- // +----+--------+------------+
- // | id | name | created |
- // +----+--------+------------+
- // | 1 | prd-1 | 1597219030 |
- // | 2 | prd-2 | 1597219030 |
- // | 3 | prd-3 | 1597219043 |
- // | 5 | prd-5 | 1597219045 |
- // | 9 | prd-9 | 1597219130 |
- // | 10 | prd-10 | 1597219130 |
- // | 13 | prd-13 | 1597219141 |
- // | 15 | prd-15 | 1597219142 |
- // +----+--------+------------+
- testTabletRecovery(t, bs0, "2m", restoreKS3Name, "-80", "INT64(8)")
-
- // mysql> select * from product;
- // +----+--------+------------+
- // | id | name | created |
- // +----+--------+------------+
- // | 4 | prd-4 | 1597219044 |
- // | 6 | prd-6 | 1597219046 |
- // | 7 | prd-7 | 1597219130 |
- // | 8 | prd-8 | 1597219130 |
- // | 11 | prd-11 | 1597219139 |
- // | 12 | prd-12 | 1597219140 |
- // | 14 | prd-14 | 1597219142 |
- // +----+--------+------------+
- testTabletRecovery(t, bs1, "2m", restoreKS3Name, "80-", "INT64(7)")
-}
-
-func performResharding(t *testing.T) {
- err := clusterInstance.VtctldClientProcess.ApplyVSchema(keyspaceName, vSchema)
- require.NoError(t, err)
-
- err = clusterInstance.VtctldClientProcess.ExecuteCommand("Reshard", "create", "--source-shards=0", "--target-shards=-80,80-", "--target-keyspace", "ks", "--workflow", "reshardWorkflow")
- require.NoError(t, err)
-
- waitTimeout := 30 * time.Second
- shard0Primary.VttabletProcess.WaitForVReplicationToCatchup(t, "ks.reshardWorkflow", dbName, sidecar.DefaultName, waitTimeout)
- shard1Primary.VttabletProcess.WaitForVReplicationToCatchup(t, "ks.reshardWorkflow", dbName, sidecar.DefaultName, waitTimeout)
-
- waitForNoWorkflowLag(t, clusterInstance, "ks", "reshardWorkflow")
-
- err = clusterInstance.VtctldClientProcess.ExecuteCommand("Reshard", "SwitchTraffic", "--tablet-types=rdonly", "--target-keyspace", "ks", "--workflow", "reshardWorkflow")
- require.NoError(t, err)
-
- err = clusterInstance.VtctldClientProcess.ExecuteCommand("Reshard", "SwitchTraffic", "--tablet-types=replica", "--target-keyspace", "ks", "--workflow", "reshardWorkflow")
- require.NoError(t, err)
-
- // then serve primary from the split shards
- err = clusterInstance.VtctldClientProcess.ExecuteCommand("Reshard", "SwitchTraffic", "--tablet-types=primary", "--target-keyspace", "ks", "--workflow", "reshardWorkflow")
- require.NoError(t, err)
-
- // remove the original tablets in the original shard
- removeTablets(t, []*cluster.Vttablet{primary, replica1, replica2})
-
- for _, tablet := range []*cluster.Vttablet{replica1, replica2} {
- err = clusterInstance.VtctldClientProcess.ExecuteCommand("DeleteTablets", tablet.Alias)
- require.NoError(t, err)
- }
- err = clusterInstance.VtctldClientProcess.ExecuteCommand("DeleteTablets", "--allow-primary", primary.Alias)
- require.NoError(t, err)
-
- // rebuild the serving graph, all mentions of the old shards should be gone
- err = clusterInstance.VtctldClientProcess.ExecuteCommand("RebuildKeyspaceGraph", "ks")
- require.NoError(t, err)
-
- // delete the original shard
- err = clusterInstance.VtctldClientProcess.ExecuteCommand("DeleteShards", "ks/0")
- require.NoError(t, err)
-
- // Restart vtgate process
- err = clusterInstance.VtgateProcess.TearDown()
- require.NoError(t, err)
-
- err = clusterInstance.VtgateProcess.Setup()
- require.NoError(t, err)
-
- clusterInstance.WaitForTabletsToHealthyInVtgate()
-}
-
-func startBinlogServer(t *testing.T, primaryTablet *cluster.Vttablet) *binLogServer {
- bs, err := newBinlogServer(hostname, clusterInstance.GetAndReservePort())
- require.NoError(t, err)
-
- err = bs.start(mysqlSource{
- hostname: binlogHost,
- port: primaryTablet.MysqlctlProcess.MySQLPort,
- username: mysqlUserName,
- password: mysqlPassword,
- })
- require.NoError(t, err)
- return bs
-}
-
-func removeTablets(t *testing.T, tablets []*cluster.Vttablet) {
- var mysqlProcs []*exec.Cmd
- for _, tablet := range tablets {
- proc, _ := tablet.MysqlctlProcess.StopProcess()
- mysqlProcs = append(mysqlProcs, proc)
- }
- for _, proc := range mysqlProcs {
- err := proc.Wait()
- require.NoError(t, err)
- }
- for _, tablet := range tablets {
- tablet.VttabletProcess.TearDown()
- }
-}
-
-func initializeCluster(t *testing.T) {
- clusterInstance = cluster.NewCluster(cell, hostname)
-
- // Start topo server
- err := clusterInstance.StartTopo()
- require.NoError(t, err)
-
- // Start keyspace
- keyspace := &cluster.Keyspace{
- Name: keyspaceName,
- }
- clusterInstance.Keyspaces = append(clusterInstance.Keyspaces, *keyspace)
-
- shard := &cluster.Shard{
- Name: shardName,
- }
- shard0 := &cluster.Shard{
- Name: shard0Name,
- }
- shard1 := &cluster.Shard{
- Name: shard1Name,
- }
-
- // Defining all the tablets
- primary = clusterInstance.NewVttabletInstance("replica", 0, "")
- replica1 = clusterInstance.NewVttabletInstance("replica", 0, "")
- replica2 = clusterInstance.NewVttabletInstance("replica", 0, "")
- shard0Primary = clusterInstance.NewVttabletInstance("replica", 0, "")
- shard0Replica1 = clusterInstance.NewVttabletInstance("replica", 0, "")
- shard0Replica2 = clusterInstance.NewVttabletInstance("replica", 0, "")
- shard1Primary = clusterInstance.NewVttabletInstance("replica", 0, "")
- shard1Replica1 = clusterInstance.NewVttabletInstance("replica", 0, "")
- shard1Replica2 = clusterInstance.NewVttabletInstance("replica", 0, "")
-
- shard.Vttablets = []*cluster.Vttablet{primary, replica1, replica2}
- shard0.Vttablets = []*cluster.Vttablet{shard0Primary, shard0Replica1, shard0Replica2}
- shard1.Vttablets = []*cluster.Vttablet{shard1Primary, shard1Replica1, shard1Replica2}
-
- dbCredentialFile = cluster.WriteDbCredentialToTmp(clusterInstance.TmpDirectory)
- extraArgs := []string{"--db-credentials-file", dbCredentialFile}
- commonTabletArg = append(commonTabletArg, "--db-credentials-file", dbCredentialFile)
-
- clusterInstance.VtTabletExtraArgs = append(clusterInstance.VtTabletExtraArgs, commonTabletArg...)
- clusterInstance.VtTabletExtraArgs = append(clusterInstance.VtTabletExtraArgs, "--restore_from_backup")
-
- err = clusterInstance.SetupCluster(keyspace, []cluster.Shard{*shard, *shard0, *shard1})
- require.NoError(t, err)
- vtctldClientProcess := cluster.VtctldClientProcessInstance("localhost", clusterInstance.VtctldProcess.GrpcPort, clusterInstance.TmpDirectory)
- out, err := vtctldClientProcess.ExecuteCommandWithOutput("SetKeyspaceDurabilityPolicy", keyspaceName, "--durability-policy=semi_sync")
- require.NoError(t, err, out)
-
- initDb, _ := os.ReadFile(path.Join(os.Getenv("VTROOT"), "/config/init_db.sql"))
- sql := string(initDb)
- // The original init_db.sql does not have any passwords. Here we update the init file with passwords
- sql, err = utils.GetInitDBSQL(sql, cluster.GetPasswordUpdateSQL(clusterInstance), "")
- require.NoError(t, err, "expected to load init_db file")
- initDBFileWithPassword = path.Join(clusterInstance.TmpDirectory, "init_db_with_passwords.sql")
- err = os.WriteFile(initDBFileWithPassword, []byte(sql), 0660)
- require.NoError(t, err, "expected to load init_db file")
-
- // Start MySql
- var mysqlCtlProcessList []*exec.Cmd
- for _, shard := range clusterInstance.Keyspaces[0].Shards {
- for _, tablet := range shard.Vttablets {
- tablet.MysqlctlProcess.InitDBFile = initDBFileWithPassword
- tablet.VttabletProcess.DbPassword = mysqlPassword
- tablet.MysqlctlProcess.ExtraArgs = extraArgs
- proc, err := tablet.MysqlctlProcess.StartProcess()
- require.NoError(t, err)
- mysqlCtlProcessList = append(mysqlCtlProcessList, proc)
- }
- }
-
- // Wait for mysql processes to start
- for _, proc := range mysqlCtlProcessList {
- err = proc.Wait()
- require.NoError(t, err)
- }
-
- for _, shard := range clusterInstance.Keyspaces[0].Shards {
- for _, tablet := range shard.Vttablets {
- err = tablet.VttabletProcess.Setup()
- require.NoError(t, err)
- }
- }
-
- err = clusterInstance.VtctldClientProcess.InitShardPrimary(keyspaceName, shard.Name, cell, primary.TabletUID)
- require.NoError(t, err)
-
- err = clusterInstance.VtctldClientProcess.InitShardPrimary(keyspaceName, shard0.Name, cell, shard0Primary.TabletUID)
- require.NoError(t, err)
-
- err = clusterInstance.VtctldClientProcess.InitShardPrimary(keyspaceName, shard1.Name, cell, shard1Primary.TabletUID)
- require.NoError(t, err)
-
- err = clusterInstance.StartVTOrc(keyspaceName)
- require.NoError(t, err)
-
- // Start vtgate
- err = clusterInstance.StartVtgate()
- require.NoError(t, err)
-}
-
-func insertRow(t *testing.T, id int, productName string, isSlow bool) {
- ctx := context.Background()
- vtParams := mysql.ConnParams{
- Host: clusterInstance.Hostname,
- Port: clusterInstance.VtgateMySQLPort,
- }
- conn, err := mysql.Connect(ctx, &vtParams)
- require.NoError(t, err)
- defer conn.Close()
-
- insertSmt := fmt.Sprintf(insertTable, id, productName)
- _, err = conn.ExecuteFetch(insertSmt, 1000, true)
- require.NoError(t, err)
-
- if isSlow {
- time.Sleep(1 * time.Second)
- }
-}
-
-func createRestoreKeyspace(t *testing.T, timeToRecover, restoreKeyspaceName string) {
- output, err := clusterInstance.VtctldClientProcess.ExecuteCommandWithOutput("CreateKeyspace",
- "--type=SNAPSHOT", "--base-keyspace="+keyspaceName,
- "--snapshot-timestamp", timeToRecover, restoreKeyspaceName)
- log.Info(output)
- require.NoError(t, err)
-}
-
-func testTabletRecovery(t *testing.T, binlogServer *binLogServer, lookupTimeout, restoreKeyspaceName, shardName, expectedRows string) {
- recoveryTablet := clusterInstance.NewVttabletInstance("replica", 0, cell)
- launchRecoveryTablet(t, recoveryTablet, binlogServer, lookupTimeout, restoreKeyspaceName, shardName)
-
- sqlRes, err := recoveryTablet.VttabletProcess.QueryTablet(getCountID, keyspaceName, true)
- require.NoError(t, err)
- assert.Equal(t, expectedRows, sqlRes.Rows[0][0].String())
-
- defer recoveryTablet.MysqlctlProcess.Stop()
- defer recoveryTablet.VttabletProcess.TearDown()
-}
-
-func launchRecoveryTablet(t *testing.T, tablet *cluster.Vttablet, binlogServer *binLogServer, lookupTimeout, restoreKeyspaceName, shardName string) {
- mysqlctlProcess, err := cluster.MysqlCtlProcessInstance(tablet.TabletUID, tablet.MySQLPort, clusterInstance.TmpDirectory)
- require.NoError(t, err)
- tablet.MysqlctlProcess = *mysqlctlProcess
- extraArgs := []string{"--db-credentials-file", dbCredentialFile}
- tablet.MysqlctlProcess.InitDBFile = initDBFileWithPassword
- tablet.MysqlctlProcess.ExtraArgs = extraArgs
- err = tablet.MysqlctlProcess.Start()
- require.NoError(t, err)
-
- tablet.VttabletProcess = cluster.VttabletProcessInstance(
- tablet.HTTPPort,
- tablet.GrpcPort,
- tablet.TabletUID,
- clusterInstance.Cell,
- shardName,
- keyspaceName,
- clusterInstance.VtctldProcess.Port,
- tablet.Type,
- clusterInstance.TopoProcess.Port,
- clusterInstance.Hostname,
- clusterInstance.TmpDirectory,
- clusterInstance.VtTabletExtraArgs,
- clusterInstance.DefaultCharset)
- tablet.Alias = tablet.VttabletProcess.TabletPath
- tablet.VttabletProcess.DbPassword = mysqlPassword
- tablet.VttabletProcess.SupportsBackup = true
- tablet.VttabletProcess.Keyspace = restoreKeyspaceName
- tablet.VttabletProcess.ExtraArgs = []string{
- "--disable_active_reparents",
- "--enable_replication_reporter=false",
- "--init_db_name_override", dbName,
- "--init_tablet_type", "replica",
- "--init_keyspace", restoreKeyspaceName,
- "--init_shard", shardName,
- "--binlog_host", binlogServer.hostname,
- "--binlog_port", fmt.Sprintf("%d", binlogServer.port),
- "--binlog_user", binlogServer.username,
- "--binlog_password", binlogServer.password,
- "--pitr_gtid_lookup_timeout", lookupTimeout,
- "--vreplication_retry_delay", "1s",
- "--degraded_threshold", "5s",
- "--lock_tables_timeout", "5s",
- "--watch_replication_stream",
- "--serving_state_grace_period", "1s",
- "--db-credentials-file", dbCredentialFile,
- }
- tablet.VttabletProcess.ServingStatus = ""
-
- err = tablet.VttabletProcess.Setup()
- require.NoError(t, err)
-
- tablet.VttabletProcess.WaitForTabletStatusesForTimeout([]string{"SERVING"}, 20*time.Second)
-}
-
-// waitForNoWorkflowLag waits for the VReplication workflow's MaxVReplicationTransactionLag
-// value to be 0.
-func waitForNoWorkflowLag(t *testing.T, vc *cluster.LocalProcessCluster, ks string, workflow string) {
- var lag int64
- timer := time.NewTimer(defaultTimeout)
- defer timer.Stop()
- for {
- output, err := vc.VtctldClientProcess.ExecuteCommandWithOutput("Workflow", "--keyspace", ks, "show", "--workflow", workflow)
- require.NoError(t, err)
-
- var resp vtctldatapb.GetWorkflowsResponse
- err = json2.UnmarshalPB([]byte(output), &resp)
- require.NoError(t, err)
- require.GreaterOrEqual(t, len(resp.Workflows), 1, "responce should have at least one workflow")
- lag = resp.Workflows[0].MaxVReplicationTransactionLag
- if lag == 0 {
- return
- }
- select {
- case <-timer.C:
- require.FailNow(t, fmt.Sprintf("workflow %q did not eliminate VReplication lag before the timeout of %s; last seen MaxVReplicationTransactionLag: %d",
- strings.Join([]string{ks, workflow}, "."), defaultTimeout, lag))
- default:
- time.Sleep(defaultTick)
- }
- }
-}
diff --git a/go/test/endtoend/utils/cmp.go b/go/test/endtoend/utils/cmp.go
index 7d94c181abd..dd9614e79fa 100644
--- a/go/test/endtoend/utils/cmp.go
+++ b/go/test/endtoend/utils/cmp.go
@@ -313,3 +313,10 @@ func (mcmp *MySQLCompare) ExecAllowError(query string) (*sqltypes.Result, error)
}
return vtQr, vtErr
}
+
+func (mcmp *MySQLCompare) VExplain(query string) string {
+ mcmp.t.Helper()
+ vtQr, vtErr := mcmp.VtConn.ExecuteFetch("vexplain plan "+query, 1, true)
+ require.NoError(mcmp.t, vtErr, "[Vitess Error] for query: "+query)
+ return vtQr.Rows[0][0].ToString()
+}
diff --git a/go/test/endtoend/vreplication/lookupindex_helper_test.go b/go/test/endtoend/vreplication/lookup_vindex_helper_test.go
similarity index 59%
rename from go/test/endtoend/vreplication/lookupindex_helper_test.go
rename to go/test/endtoend/vreplication/lookup_vindex_helper_test.go
index 864a5e0f7fc..1c74dadc642 100644
--- a/go/test/endtoend/vreplication/lookupindex_helper_test.go
+++ b/go/test/endtoend/vreplication/lookup_vindex_helper_test.go
@@ -29,7 +29,7 @@ import (
binlogdatapb "vitess.io/vitess/go/vt/proto/binlogdata"
)
-type lookupIndex struct {
+type lookupVindex struct {
typ string
name string
tableKeyspace string
@@ -42,64 +42,64 @@ type lookupIndex struct {
t *testing.T
}
-func (li *lookupIndex) String() string {
- return li.typ + " " + li.name + " on " + li.tableKeyspace + "." + li.table + " (" + li.columns[0] + ")"
+func (lv *lookupVindex) String() string {
+ return lv.typ + " " + lv.name + " on " + lv.tableKeyspace + "." + lv.table + " (" + lv.columns[0] + ")"
}
-func (li *lookupIndex) create() {
- cols := strings.Join(li.columns, ",")
+func (lv *lookupVindex) create() {
+ cols := strings.Join(lv.columns, ",")
args := []string{
"LookupVindex",
- "--name", li.name,
- "--table-keyspace=" + li.ownerTableKeyspace,
+ "--name", lv.name,
+ "--table-keyspace=" + lv.ownerTableKeyspace,
"create",
- "--keyspace=" + li.tableKeyspace,
- "--type=" + li.typ,
- "--table-owner=" + li.ownerTable,
+ "--keyspace=" + lv.tableKeyspace,
+ "--type=" + lv.typ,
+ "--table-owner=" + lv.ownerTable,
"--table-owner-columns=" + cols,
"--tablet-types=PRIMARY",
}
- if li.ignoreNulls {
+ if lv.ignoreNulls {
args = append(args, "--ignore-nulls")
}
err := vc.VtctldClient.ExecuteCommand(args...)
- require.NoError(li.t, err, "error executing LookupVindex create: %v", err)
- waitForWorkflowState(li.t, vc, fmt.Sprintf("%s.%s", li.ownerTableKeyspace, li.name), binlogdatapb.VReplicationWorkflowState_Running.String())
- li.expectWriteOnly(true)
+ require.NoError(lv.t, err, "error executing LookupVindex create: %v", err)
+ waitForWorkflowState(lv.t, vc, fmt.Sprintf("%s.%s", lv.ownerTableKeyspace, lv.name), binlogdatapb.VReplicationWorkflowState_Running.String())
+ lv.expectWriteOnly(true)
}
-func (li *lookupIndex) cancel() {
+func (lv *lookupVindex) cancel() {
panic("not implemented")
}
-func (li *lookupIndex) externalize() {
+func (lv *lookupVindex) externalize() {
args := []string{
"LookupVindex",
- "--name", li.name,
- "--table-keyspace=" + li.ownerTableKeyspace,
+ "--name", lv.name,
+ "--table-keyspace=" + lv.ownerTableKeyspace,
"externalize",
- "--keyspace=" + li.tableKeyspace,
+ "--keyspace=" + lv.tableKeyspace,
}
err := vc.VtctldClient.ExecuteCommand(args...)
- require.NoError(li.t, err, "error executing LookupVindex externalize: %v", err)
- li.expectWriteOnly(false)
+ require.NoError(lv.t, err, "error executing LookupVindex externalize: %v", err)
+ lv.expectWriteOnly(false)
}
-func (li *lookupIndex) show() error {
+func (lv *lookupVindex) show() error {
return nil
}
-func (li *lookupIndex) expectWriteOnly(expected bool) {
- vschema, err := vc.VtctldClient.ExecuteCommandWithOutput("GetVSchema", li.ownerTableKeyspace)
- require.NoError(li.t, err, "error executing GetVSchema: %v", err)
- vdx := gjson.Get(vschema, fmt.Sprintf("vindexes.%s", li.name))
- require.NotNil(li.t, vdx, "lookup vindex %s not found", li.name)
+func (lv *lookupVindex) expectWriteOnly(expected bool) {
+ vschema, err := vc.VtctldClient.ExecuteCommandWithOutput("GetVSchema", lv.ownerTableKeyspace)
+ require.NoError(lv.t, err, "error executing GetVSchema: %v", err)
+ vdx := gjson.Get(vschema, fmt.Sprintf("vindexes.%s", lv.name))
+ require.NotNil(lv.t, vdx, "lookup vindex %s not found", lv.name)
want := ""
if expected {
want = "true"
}
- require.Equal(li.t, want, vdx.Get("params.write_only").String(), "expected write_only parameter to be %s", want)
+ require.Equal(lv.t, want, vdx.Get("params.write_only").String(), "expected write_only parameter to be %s", want)
}
func getNumRowsInQuery(t *testing.T, query string) int {
diff --git a/go/test/endtoend/vreplication/lookupindex_test.go b/go/test/endtoend/vreplication/lookup_vindex_test.go
similarity index 90%
rename from go/test/endtoend/vreplication/lookupindex_test.go
rename to go/test/endtoend/vreplication/lookup_vindex_test.go
index 348a0ee5906..c0864b26cca 100644
--- a/go/test/endtoend/vreplication/lookupindex_test.go
+++ b/go/test/endtoend/vreplication/lookup_vindex_test.go
@@ -63,7 +63,7 @@ create table t1(
`,
}
-func setupLookupIndexKeyspace(t *testing.T) map[string]*cluster.VttabletProcess {
+func setupLookupVindexKeyspace(t *testing.T) map[string]*cluster.VttabletProcess {
tablets := make(map[string]*cluster.VttabletProcess)
if _, err := vc.AddKeyspace(t, []*Cell{vc.Cells["zone1"]}, lookupClusterSpec.keyspaceName, "-80,80-",
lookupClusterSpec.vschema, lookupClusterSpec.schema, defaultReplicas, defaultRdonly, 200, nil); err != nil {
@@ -80,14 +80,14 @@ func setupLookupIndexKeyspace(t *testing.T) map[string]*cluster.VttabletProcess
type lookupTestCase struct {
name string
- li *lookupIndex
+ lv *lookupVindex
initQuery string
runningQuery string
postExternalizeQuery string
cleanupQuery string
}
-func TestLookupIndex(t *testing.T) {
+func TestLookupVindex(t *testing.T) {
setSidecarDBName("_vt")
origDefaultReplicas := defaultReplicas
origDefaultRdonly := defaultRdonly
@@ -101,7 +101,7 @@ func TestLookupIndex(t *testing.T) {
defer vc.TearDown()
vttablet.InitVReplicationConfigDefaults()
- _ = setupLookupIndexKeyspace(t)
+ _ = setupLookupVindexKeyspace(t)
initQuery := "insert into t1 (c1, c2, val) values (1, 1, 'val1'), (2, 2, 'val2'), (3, 3, 'val3')"
runningQuery := "insert into t1 (c1, c2, val) values (4, 4, 'val4'), (5, 5, 'val5'), (6, 6, 'val6')"
@@ -111,7 +111,7 @@ func TestLookupIndex(t *testing.T) {
testCases := []lookupTestCase{
{
name: "non-unique lookup index, one column",
- li: &lookupIndex{
+ lv: &lookupVindex{
typ: "consistent_lookup",
name: "t1_c2_lookup",
tableKeyspace: lookupClusterSpec.keyspaceName,
@@ -125,7 +125,7 @@ func TestLookupIndex(t *testing.T) {
},
{
name: "lookup index, two columns",
- li: &lookupIndex{
+ lv: &lookupVindex{
typ: "lookup",
name: "t1_c2_val_lookup",
tableKeyspace: lookupClusterSpec.keyspaceName,
@@ -139,7 +139,7 @@ func TestLookupIndex(t *testing.T) {
},
{
name: "unique lookup index, one column",
- li: &lookupIndex{
+ lv: &lookupVindex{
typ: "lookup_unique",
name: "t1_c2_unique_lookup",
tableKeyspace: lookupClusterSpec.keyspaceName,
@@ -168,7 +168,7 @@ func testLookupVindex(t *testing.T, tc *lookupTestCase) {
vtgateConn, cancel := getVTGateConn()
defer cancel()
var totalRows int
- li := tc.li
+ lv := tc.lv
t.Run("init data", func(t *testing.T) {
totalRows += getNumRowsInQuery(t, tc.initQuery)
@@ -177,28 +177,28 @@ func testLookupVindex(t *testing.T, tc *lookupTestCase) {
})
t.Run("create", func(t *testing.T) {
- tc.li.create()
+ tc.lv.create()
- lks := li.tableKeyspace
- vindexName := li.name
+ lks := lv.tableKeyspace
+ vindexName := lv.name
waitForRowCount(t, vtgateConn, lks, vindexName, totalRows)
totalRows += getNumRowsInQuery(t, tc.runningQuery)
_, err := vtgateConn.ExecuteFetch(tc.runningQuery, 1000, false)
require.NoError(t, err)
- waitForRowCount(t, vtgateConn, tc.li.ownerTableKeyspace, li.name, totalRows)
+ waitForRowCount(t, vtgateConn, tc.lv.ownerTableKeyspace, lv.name, totalRows)
})
t.Run("externalize", func(t *testing.T) {
- tc.li.externalize()
+ tc.lv.externalize()
totalRows += getNumRowsInQuery(t, tc.postExternalizeQuery)
_, err := vtgateConn.ExecuteFetch(tc.postExternalizeQuery, 1000, false)
require.NoError(t, err)
- waitForRowCount(t, vtgateConn, tc.li.ownerTableKeyspace, li.name, totalRows)
+ waitForRowCount(t, vtgateConn, tc.lv.ownerTableKeyspace, lv.name, totalRows)
})
t.Run("cleanup", func(t *testing.T) {
_, err := vtgateConn.ExecuteFetch(tc.cleanupQuery, 1000, false)
require.NoError(t, err)
- waitForRowCount(t, vtgateConn, tc.li.ownerTableKeyspace, li.name, 0)
+ waitForRowCount(t, vtgateConn, tc.lv.ownerTableKeyspace, lv.name, 0)
})
}
diff --git a/go/test/endtoend/vreplication/vreplication_test.go b/go/test/endtoend/vreplication/vreplication_test.go
index d3193298a0c..955afde2f18 100644
--- a/go/test/endtoend/vreplication/vreplication_test.go
+++ b/go/test/endtoend/vreplication/vreplication_test.go
@@ -323,8 +323,10 @@ func testVreplicationWorkflows(t *testing.T, limited bool, binlogRowImage string
defer func() { defaultReplicas = 1 }()
if binlogRowImage != "" {
- require.NoError(t, utils.SetBinlogRowImageMode("noblob", vc.ClusterConfig.tmpDir))
- defer utils.SetBinlogRowImageMode("", vc.ClusterConfig.tmpDir)
+ // Run the e2e test with binlog_row_image=NOBLOB and
+ // binlog_row_value_options=PARTIAL_JSON.
+ require.NoError(t, utils.SetBinlogRowImageOptions("noblob", true, vc.ClusterConfig.tmpDir))
+ defer utils.SetBinlogRowImageOptions("", false, vc.ClusterConfig.tmpDir)
}
defaultCell := vc.Cells[defaultCellName]
@@ -600,8 +602,10 @@ func TestCellAliasVreplicationWorkflow(t *testing.T) {
keyspace := "product"
shard := "0"
- require.NoError(t, utils.SetBinlogRowImageMode("noblob", vc.ClusterConfig.tmpDir))
- defer utils.SetBinlogRowImageMode("", vc.ClusterConfig.tmpDir)
+ // Run the e2e test with binlog_row_image=NOBLOB and
+ // binlog_row_value_options=PARTIAL_JSON.
+ require.NoError(t, utils.SetBinlogRowImageOptions("noblob", true, vc.ClusterConfig.tmpDir))
+ defer utils.SetBinlogRowImageOptions("", false, vc.ClusterConfig.tmpDir)
cell1 := vc.Cells["zone1"]
cell2 := vc.Cells["zone2"]
@@ -721,8 +725,18 @@ func shardCustomer(t *testing.T, testReverse bool, cells []*Cell, sourceCellOrAl
// Confirm that the 0 scale decimal field, dec80, is replicated correctly
execVtgateQuery(t, vtgateConn, sourceKs, "update customer set dec80 = 0")
execVtgateQuery(t, vtgateConn, sourceKs, "update customer set blb = \"new blob data\" where cid=3")
- execVtgateQuery(t, vtgateConn, sourceKs, "update json_tbl set j1 = null, j2 = 'null', j3 = '\"null\"'")
+ execVtgateQuery(t, vtgateConn, sourceKs, "update json_tbl set j1 = null, j2 = 'null', j3 = '\"null\"' where id = 5")
execVtgateQuery(t, vtgateConn, sourceKs, "insert into json_tbl(id, j1, j2, j3) values (7, null, 'null', '\"null\"')")
+ // Test binlog-row-value-options=PARTIAL_JSON
+ execVtgateQuery(t, vtgateConn, sourceKs, "update json_tbl set j3 = JSON_SET(j3, '$.role', 'manager')")
+ execVtgateQuery(t, vtgateConn, sourceKs, "update json_tbl set j3 = JSON_SET(j3, '$.color', 'red')")
+ execVtgateQuery(t, vtgateConn, sourceKs, "update json_tbl set j3 = JSON_SET(j3, '$.day', 'wednesday')")
+ execVtgateQuery(t, vtgateConn, sourceKs, "update json_tbl set j3 = JSON_INSERT(JSON_REPLACE(j3, '$.day', 'friday'), '$.favorite_color', 'black')")
+ execVtgateQuery(t, vtgateConn, sourceKs, "update json_tbl set j3 = JSON_SET(JSON_REMOVE(JSON_REPLACE(j3, '$.day', 'monday'), '$.favorite_color'), '$.hobby', 'skiing') where id = 3")
+ execVtgateQuery(t, vtgateConn, sourceKs, "update json_tbl set j3 = JSON_SET(JSON_REMOVE(JSON_REPLACE(j3, '$.day', 'tuesday'), '$.favorite_color'), '$.hobby', 'skiing') where id = 4")
+ execVtgateQuery(t, vtgateConn, sourceKs, "update json_tbl set j3 = JSON_SET(JSON_SET(j3, '$.salary', 110), '$.role', 'IC') where id = 4")
+ execVtgateQuery(t, vtgateConn, sourceKs, "update json_tbl set j3 = JSON_SET(j3, '$.misc', '{\"address\":\"1012 S Park St\", \"town\":\"Hastings\", \"state\":\"MI\"}') where id = 1")
+ execVtgateQuery(t, vtgateConn, sourceKs, "update json_tbl set id=id+1000, j3=JSON_SET(j3, '$.day', 'friday')")
waitForNoWorkflowLag(t, vc, targetKs, workflow)
dec80Replicated := false
for _, tablet := range []*cluster.VttabletProcess{customerTab1, customerTab2} {
diff --git a/go/test/endtoend/vtgate/plan_tests/main_test.go b/go/test/endtoend/vtgate/plan_tests/main_test.go
index d3915af0c8d..504ec3ffb26 100644
--- a/go/test/endtoend/vtgate/plan_tests/main_test.go
+++ b/go/test/endtoend/vtgate/plan_tests/main_test.go
@@ -27,6 +27,7 @@ import (
"vitess.io/vitess/go/mysql"
"vitess.io/vitess/go/test/endtoend/cluster"
"vitess.io/vitess/go/test/endtoend/utils"
+ "vitess.io/vitess/go/vt/sqlparser"
"vitess.io/vitess/go/vt/vtgate/engine"
"vitess.io/vitess/go/vt/vtgate/planbuilder"
)
@@ -128,6 +129,31 @@ func start(t *testing.T) (utils.MySQLCompare, func()) {
}
}
+// splitSQL statements - querySQL may be a multi-line sql blob
+func splitSQL(querySQL ...string) ([]string, error) {
+ parser := sqlparser.NewTestParser()
+ var sqls []string
+ for _, sql := range querySQL {
+ split, err := parser.SplitStatementToPieces(sql)
+ if err != nil {
+ return nil, err
+ }
+ sqls = append(sqls, split...)
+ }
+ return sqls, nil
+}
+
+func loadSampleData(t *testing.T, mcmp utils.MySQLCompare) {
+ sampleDataSQL := readFile("sampledata/user.sql")
+ insertSQL, err := splitSQL(sampleDataSQL)
+ if err != nil {
+ require.NoError(t, err)
+ }
+ for _, sql := range insertSQL {
+ mcmp.ExecNoCompare(sql)
+ }
+}
+
func readJSONTests(filename string) []planbuilder.PlanTest {
var output []planbuilder.PlanTest
file, err := os.Open(locateFile(filename))
diff --git a/go/test/endtoend/vtgate/plan_tests/plan_e2e_test.go b/go/test/endtoend/vtgate/plan_tests/plan_e2e_test.go
index 1594e9b392c..5c5447fe6b6 100644
--- a/go/test/endtoend/vtgate/plan_tests/plan_e2e_test.go
+++ b/go/test/endtoend/vtgate/plan_tests/plan_e2e_test.go
@@ -22,21 +22,25 @@ import (
"vitess.io/vitess/go/test/endtoend/utils"
)
-func TestSelectCases(t *testing.T) {
+func TestE2ECases(t *testing.T) {
+ e2eTestCaseFiles := []string{"select_cases.json", "filter_cases.json", "dml_cases.json"}
mcmp, closer := start(t)
defer closer()
- tests := readJSONTests("select_cases.json")
- for _, test := range tests {
- mcmp.Run(test.Comment, func(mcmp *utils.MySQLCompare) {
- if test.SkipE2E {
- mcmp.AsT().Skip(test.Query)
- }
- mcmp.Exec(test.Query)
- pd := utils.ExecTrace(mcmp.AsT(), mcmp.VtConn, test.Query)
- verifyTestExpectations(mcmp.AsT(), pd, test)
- if mcmp.VtConn.IsClosed() {
- mcmp.AsT().Fatal("vtgate connection is closed")
- }
- })
+ loadSampleData(t, mcmp)
+ for _, fileName := range e2eTestCaseFiles {
+ tests := readJSONTests(fileName)
+ for _, test := range tests {
+ mcmp.Run(test.Comment, func(mcmp *utils.MySQLCompare) {
+ if test.SkipE2E {
+ mcmp.AsT().Skip(test.Query)
+ }
+ mcmp.Exec(test.Query)
+ pd := utils.ExecTrace(mcmp.AsT(), mcmp.VtConn, test.Query)
+ verifyTestExpectations(mcmp.AsT(), pd, test)
+ if mcmp.VtConn.IsClosed() {
+ mcmp.AsT().Fatal("vtgate connection is closed")
+ }
+ })
+ }
}
}
diff --git a/go/test/endtoend/vtgate/queries/misc/misc_test.go b/go/test/endtoend/vtgate/queries/misc/misc_test.go
index 235762e816a..4714c9f35e7 100644
--- a/go/test/endtoend/vtgate/queries/misc/misc_test.go
+++ b/go/test/endtoend/vtgate/queries/misc/misc_test.go
@@ -131,6 +131,61 @@ func TestCast(t *testing.T) {
mcmp.AssertMatches("select cast('3.2' as unsigned)", `[[UINT64(3)]]`)
}
+// TestSetAndGetLastInsertID tests that the last_insert_id function works as intended when used with different arguments.
+func TestSetAndGetLastInsertID(t *testing.T) {
+ notZero := 1
+ checkQuery := func(i string, workload string, tx bool, mcmp utils.MySQLCompare) {
+ for _, val := range []int{notZero, 0, notZero * 2} {
+ query := fmt.Sprintf(i, val)
+ name := fmt.Sprintf("%s - %s", workload, query)
+ if tx {
+ name = "tx - " + name
+ }
+ mcmp.Run(name, func(mcmp *utils.MySQLCompare) {
+ mcmp.Exec(query)
+ mcmp.Exec("select last_insert_id()")
+ t := mcmp.AsT()
+ if t.Failed() {
+ t.Log(mcmp.VExplain(query))
+ }
+ })
+ }
+ // we need this value to be not zero, and then we keep changing it so different queries don't interact with each other
+ notZero++
+ }
+
+ queries := []string{
+ "select last_insert_id(%d)",
+ "select last_insert_id(%d), id1, id2 from t1 limit 1",
+ "select last_insert_id(%d), id1, id2 from t1 where 1 = 2",
+ "select 12 from t1 where last_insert_id(%d)",
+ "update t1 set id2 = last_insert_id(%d) where id1 = 1",
+ "update t1 set id2 = last_insert_id(%d) where id1 = 2",
+ "update t1 set id2 = 88 where id1 = last_insert_id(%d)",
+ "delete from t1 where id1 = last_insert_id(%d)",
+ }
+
+ for _, workload := range []string{"olap", "oltp"} {
+ for _, tx := range []bool{true, false} {
+ mcmp, closer := start(t)
+ _, err := mcmp.VtConn.ExecuteFetch(fmt.Sprintf("set workload = %s", workload), 1000, false)
+ require.NoError(t, err)
+ if tx {
+ _, err := mcmp.VtConn.ExecuteFetch("begin", 1000, false)
+ require.NoError(t, err)
+ }
+
+ // Insert a row for UPDATE tests
+ mcmp.Exec("insert into t1 (id1, id2) values (1, 10)")
+
+ for _, query := range queries {
+ checkQuery(query, workload, tx, mcmp)
+ }
+ closer()
+ }
+ }
+}
+
// TestVindexHints tests that vindex hints work as intended.
func TestVindexHints(t *testing.T) {
mcmp, closer := start(t)
diff --git a/go/test/utils/binlog.go b/go/test/utils/binlog.go
index d3f686f1a8a..6e43dd511ad 100644
--- a/go/test/utils/binlog.go
+++ b/go/test/utils/binlog.go
@@ -17,8 +17,10 @@ limitations under the License.
package utils
import (
+ "errors"
"fmt"
"os"
+ "strconv"
"strings"
)
@@ -27,9 +29,12 @@ const (
BinlogRowImageCnf = "binlog-row-image.cnf"
)
-// SetBinlogRowImageMode creates a temp cnf file to set binlog_row_image to noblob for vreplication unit tests.
-// It adds it to the EXTRA_MY_CNF environment variable which appends text from them into my.cnf.
-func SetBinlogRowImageMode(mode string, cnfDir string) error {
+// SetBinlogRowImageOptions creates a temp cnf file to set binlog_row_image=NOBLOB and
+// optionally binlog_row_value_options=PARTIAL_JSON (since it does not exist in 5.7)
+// for vreplication unit tests.
+// It adds it to the EXTRA_MY_CNF environment variable which appends text from them
+// into my.cnf.
+func SetBinlogRowImageOptions(mode string, partialJSON bool, cnfDir string) error {
var newCnfs []string
// remove any existing extra cnfs for binlog row image
@@ -55,6 +60,17 @@ func SetBinlogRowImageMode(mode string, cnfDir string) error {
if err != nil {
return err
}
+ if partialJSON {
+ if !CIDBPlatformIsMySQL8orLater() {
+ return errors.New("partial JSON values are only supported in MySQL 8.0 or later")
+ }
+ // We're testing partial binlog row images so let's also test partial
+ // JSON values in the images.
+ _, err = f.WriteString("\nbinlog_row_value_options=PARTIAL_JSON\n")
+ if err != nil {
+ return err
+ }
+ }
err = f.Close()
if err != nil {
return err
@@ -68,3 +84,30 @@ func SetBinlogRowImageMode(mode string, cnfDir string) error {
}
return nil
}
+
+// CIDBPlatformIsMySQL8orLater returns true if the CI_DB_PLATFORM environment
+// variable is empty -- meaning we're not running in the CI and we assume
+// MySQL8.0 or later is used, and you can understand the failures and make
+// adjustments as necessary -- or it's set to reflect usage of MySQL 8.0 or
+// later. This relies on the current standard values used such as mysql57,
+// mysql80, mysql84, etc. This can be used when the CI test behavior needs
+// to be altered based on the specific database platform we're testing against.
+func CIDBPlatformIsMySQL8orLater() bool {
+ dbPlatform := strings.ToLower(os.Getenv("CI_DB_PLATFORM"))
+ if dbPlatform == "" {
+ // This is for local testing where we don't set the env var via
+ // the CI.
+ return true
+ }
+ if strings.HasPrefix(dbPlatform, "mysql") {
+ _, v, ok := strings.Cut(dbPlatform, "mysql")
+ if ok {
+ // We only want the major version.
+ version, err := strconv.Atoi(string(v[0]))
+ if err == nil && version >= 8 {
+ return true
+ }
+ }
+ }
+ return false
+}
diff --git a/go/test/utils/binlog_test.go b/go/test/utils/binlog_test.go
index 593b964a171..d8a0d6d4222 100644
--- a/go/test/utils/binlog_test.go
+++ b/go/test/utils/binlog_test.go
@@ -24,19 +24,33 @@ import (
"github.com/stretchr/testify/require"
)
-// TestSetBinlogRowImageMode tests the SetBinlogRowImageMode function.
+// TestSetBinlogRowImageOptions tests the SetBinlogRowImageOptions function.
func TestUtils(t *testing.T) {
tmpDir := "/tmp"
cnfFile := fmt.Sprintf("%s/%s", tmpDir, BinlogRowImageCnf)
+
// Test that setting the mode will create the cnf file and add it to the EXTRA_MY_CNF env var.
- require.NoError(t, SetBinlogRowImageMode("noblob", tmpDir))
+ require.NoError(t, SetBinlogRowImageOptions("noblob", false, tmpDir))
data, err := os.ReadFile(cnfFile)
require.NoError(t, err)
require.Contains(t, string(data), "binlog_row_image=noblob")
require.Contains(t, os.Getenv(ExtraCnf), BinlogRowImageCnf)
+ // Test that setting the mode and passing true for includePartialJSON will set both options
+ // as expected.
+ if CIDBPlatformIsMySQL8orLater() {
+ require.NoError(t, SetBinlogRowImageOptions("noblob", true, tmpDir))
+ data, err = os.ReadFile(cnfFile)
+ require.NoError(t, err)
+ require.Contains(t, string(data), "binlog_row_image=noblob")
+ require.Contains(t, string(data), "binlog_row_value_options=PARTIAL_JSON")
+ require.Contains(t, os.Getenv(ExtraCnf), BinlogRowImageCnf)
+ } else {
+ require.Error(t, SetBinlogRowImageOptions("noblob", true, tmpDir))
+ }
+
// Test that clearing the mode will remove the cnf file and the cnf from the EXTRA_MY_CNF env var.
- require.NoError(t, SetBinlogRowImageMode("", tmpDir))
+ require.NoError(t, SetBinlogRowImageOptions("", false, tmpDir))
require.NotContains(t, os.Getenv(ExtraCnf), BinlogRowImageCnf)
_, err = os.Stat(cnfFile)
require.True(t, os.IsNotExist(err))
diff --git a/go/vt/binlog/binlog_streamer.go b/go/vt/binlog/binlog_streamer.go
index d62fcc3a915..08e06ec803c 100644
--- a/go/vt/binlog/binlog_streamer.go
+++ b/go/vt/binlog/binlog_streamer.go
@@ -760,7 +760,7 @@ func writeValuesAsSQL(sql *sqlparser.TrackedBuffer, tce *tableCacheEntry, rs *my
}
// We have real data.
- value, l, err := binlog.CellValue(data, pos, tce.tm.Types[c], tce.tm.Metadata[c], &querypb.Field{Type: tce.ti.Fields[c].Type})
+ value, l, err := binlog.CellValue(data, pos, tce.tm.Types[c], tce.tm.Metadata[c], &querypb.Field{Type: tce.ti.Fields[c].Type}, false)
if err != nil {
return keyspaceIDCell, nil, err
}
@@ -825,7 +825,7 @@ func writeIdentifiersAsSQL(sql *sqlparser.TrackedBuffer, tce *tableCacheEntry, r
sql.WriteByte('=')
// We have real data.
- value, l, err := binlog.CellValue(data, pos, tce.tm.Types[c], tce.tm.Metadata[c], &querypb.Field{Type: tce.ti.Fields[c].Type})
+ value, l, err := binlog.CellValue(data, pos, tce.tm.Types[c], tce.tm.Metadata[c], &querypb.Field{Type: tce.ti.Fields[c].Type}, false)
if err != nil {
return keyspaceIDCell, nil, err
}
diff --git a/go/vt/key/key.go b/go/vt/key/key.go
index dcdcda47f81..89d956bd433 100644
--- a/go/vt/key/key.go
+++ b/go/vt/key/key.go
@@ -90,6 +90,11 @@ func Empty(id []byte) bool {
// KeyRange helper methods
//
+// Make a Key Range
+func NewKeyRange(start []byte, end []byte) *topodatapb.KeyRange {
+ return &topodatapb.KeyRange{Start: start, End: end}
+}
+
// KeyRangeAdd adds two adjacent KeyRange values (in any order) into a single value. If the values are not adjacent,
// it returns false.
func KeyRangeAdd(a, b *topodatapb.KeyRange) (*topodatapb.KeyRange, bool) {
diff --git a/go/vt/mysqlctl/s3backupstorage/s3.go b/go/vt/mysqlctl/s3backupstorage/s3.go
index 97861e83729..4dd583009aa 100644
--- a/go/vt/mysqlctl/s3backupstorage/s3.go
+++ b/go/vt/mysqlctl/s3backupstorage/s3.go
@@ -47,6 +47,7 @@ import (
"github.com/aws/aws-sdk-go-v2/service/s3/types"
transport "github.com/aws/smithy-go/endpoints"
"github.com/aws/smithy-go/middleware"
+ "github.com/dustin/go-humanize"
"github.com/spf13/pflag"
errorsbackup "vitess.io/vitess/go/vt/mysqlctl/errors"
@@ -57,6 +58,11 @@ import (
"vitess.io/vitess/go/vt/servenv"
)
+const (
+ sseCustomerPrefix = "sse_c:"
+ MaxPartSize = 1024 * 1024 * 1024 * 5 // 5GiB - limited by AWS https://docs.aws.amazon.com/AmazonS3/latest/userguide/qfacts.html
+)
+
var (
// AWS API region
region string
@@ -86,6 +92,11 @@ var (
// path component delimiter
delimiter = "/"
+
+ // minimum part size
+ minPartSize int64
+
+ ErrPartSize = errors.New("minimum S3 part size must be between 5MiB and 5GiB")
)
func registerFlags(fs *pflag.FlagSet) {
@@ -98,6 +109,7 @@ func registerFlags(fs *pflag.FlagSet) {
fs.BoolVar(&tlsSkipVerifyCert, "s3_backup_tls_skip_verify_cert", false, "skip the 'certificate is valid' check for SSL connections.")
fs.StringVar(&requiredLogLevel, "s3_backup_log_level", "LogOff", "determine the S3 loglevel to use from LogOff, LogDebug, LogDebugWithSigning, LogDebugWithHTTPBody, LogDebugWithRequestRetries, LogDebugWithRequestErrors.")
fs.StringVar(&sse, "s3_backup_server_side_encryption", "", "server-side encryption algorithm (e.g., AES256, aws:kms, sse_c:/path/to/key/file).")
+ fs.Int64Var(&minPartSize, "s3_backup_aws_min_partsize", manager.MinUploadPartSize, "Minimum part size to use, defaults to 5MiB but can be increased due to the dataset size.")
}
func init() {
@@ -111,8 +123,6 @@ type logNameToLogLevel map[string]aws.ClientLogMode
var logNameMap logNameToLogLevel
-const sseCustomerPrefix = "sse_c:"
-
type endpointResolver struct {
r s3.EndpointResolverV2
endpoint *string
@@ -166,7 +176,12 @@ func (bh *S3BackupHandle) AddFile(ctx context.Context, filename string, filesize
return nil, fmt.Errorf("AddFile cannot be called on read-only backup")
}
- partSizeBytes := calculateUploadPartSize(filesize)
+ partSizeBytes, err := calculateUploadPartSize(filesize)
+ if err != nil {
+ return nil, err
+ }
+
+ bh.bs.params.Logger.Infof("Using S3 upload part size: %s", humanize.IBytes(uint64(partSizeBytes)))
reader, writer := io.Pipe()
bh.handleAddFile(ctx, filename, partSizeBytes, reader, func(err error) {
@@ -213,9 +228,11 @@ func (bh *S3BackupHandle) handleAddFile(ctx context.Context, filename string, pa
}()
}
-func calculateUploadPartSize(filesize int64) int64 {
+// calculateUploadPartSize is a helper to calculate the part size, taking into consideration the minimum part size
+// passed in by an operator.
+func calculateUploadPartSize(filesize int64) (partSizeBytes int64, err error) {
// Calculate s3 upload part size using the source filesize
- partSizeBytes := manager.DefaultUploadPartSize
+ partSizeBytes = manager.DefaultUploadPartSize
if filesize > 0 {
minimumPartSize := float64(filesize) / float64(manager.MaxUploadParts)
// Round up to ensure large enough partsize
@@ -224,7 +241,17 @@ func calculateUploadPartSize(filesize int64) int64 {
partSizeBytes = calculatedPartSizeBytes
}
}
- return partSizeBytes
+
+ if minPartSize != 0 && partSizeBytes < minPartSize {
+ if minPartSize > MaxPartSize || minPartSize < manager.MinUploadPartSize { // 5GiB and 5MiB respectively
+ return 0, fmt.Errorf("%w, currently set to %s",
+ ErrPartSize, humanize.IBytes(uint64(minPartSize)),
+ )
+ }
+ partSizeBytes = int64(minPartSize)
+ }
+
+ return
}
// EndBackup is part of the backupstorage.BackupHandle interface.
diff --git a/go/vt/mysqlctl/s3backupstorage/s3_mock.go b/go/vt/mysqlctl/s3backupstorage/s3_mock.go
index f244c4d63b1..910a22bd9d5 100644
--- a/go/vt/mysqlctl/s3backupstorage/s3_mock.go
+++ b/go/vt/mysqlctl/s3backupstorage/s3_mock.go
@@ -162,7 +162,11 @@ func FailFirstWrite(s3bh *S3BackupHandle, ctx context.Context, filename string,
return nil, fmt.Errorf("AddFile cannot be called on read-only backup")
}
- partSizeBytes := calculateUploadPartSize(filesize)
+ partSizeBytes, err := calculateUploadPartSize(filesize)
+ if err != nil {
+ return nil, err
+ }
+
reader, writer := io.Pipe()
r := io.Reader(reader)
@@ -181,7 +185,11 @@ func FailAllWrites(s3bh *S3BackupHandle, ctx context.Context, filename string, f
return nil, fmt.Errorf("AddFile cannot be called on read-only backup")
}
- partSizeBytes := calculateUploadPartSize(filesize)
+ partSizeBytes, err := calculateUploadPartSize(filesize)
+ if err != nil {
+ return nil, err
+ }
+
reader, writer := io.Pipe()
r := &failReadPipeReader{PipeReader: reader}
diff --git a/go/vt/mysqlctl/s3backupstorage/s3_test.go b/go/vt/mysqlctl/s3backupstorage/s3_test.go
index 84ef8de6e48..5e9364219af 100644
--- a/go/vt/mysqlctl/s3backupstorage/s3_test.go
+++ b/go/vt/mysqlctl/s3backupstorage/s3_test.go
@@ -328,3 +328,68 @@ func TestWithParams(t *testing.T) {
assert.NotNil(t, s3.transport.DialContext)
assert.NotNil(t, s3.transport.Proxy)
}
+
+func TestCalculateUploadPartSize(t *testing.T) {
+ originalMinimum := minPartSize
+ defer func() { minPartSize = originalMinimum }()
+
+ tests := []struct {
+ name string
+ filesize int64
+ minimumPartSize int64
+ want int64
+ err error
+ }{
+ {
+ name: "minimum - 10 MiB",
+ filesize: 1024 * 1024 * 10, // 10 MiB
+ minimumPartSize: 1024 * 1024 * 5, // 5 MiB
+ want: 1024 * 1024 * 5, // 5 MiB,
+ err: nil,
+ },
+ {
+ name: "below minimum - 10 MiB",
+ filesize: 1024 * 1024 * 10, // 10 MiB
+ minimumPartSize: 1024 * 1024 * 8, // 8 MiB
+ want: 1024 * 1024 * 8, // 8 MiB,
+ err: nil,
+ },
+ {
+ name: "above minimum - 1 TiB",
+ filesize: 1024 * 1024 * 1024 * 1024, // 1 TiB
+ minimumPartSize: 1024 * 1024 * 5, // 5 MiB
+ want: 109951163, // ~104 MiB
+ err: nil,
+ },
+ {
+ name: "below minimum - 1 TiB",
+ filesize: 1024 * 1024 * 1024 * 1024, // 1 TiB
+ minimumPartSize: 1024 * 1024 * 200, // 200 MiB
+ want: 1024 * 1024 * 200, // 200 MiB
+ err: nil,
+ },
+ {
+ name: "below S3 limits - 5 MiB",
+ filesize: 1024 * 1024 * 3, // 3 MiB
+ minimumPartSize: 1024 * 1024 * 4, // 4 MiB
+ want: 1024 * 1024 * 5, // 5 MiB - should always return the minimum
+ err: nil,
+ },
+ {
+ name: "above S3 limits - 5 GiB",
+ filesize: 1024 * 1024 * 1024 * 1024, // 1 TiB
+ minimumPartSize: 1024 * 1024 * 1024 * 6, // 6 GiB
+ want: 0,
+ err: ErrPartSize,
+ },
+ }
+
+ for _, tt := range tests {
+ t.Run(tt.name, func(t *testing.T) {
+ minPartSize = tt.minimumPartSize
+ partSize, err := calculateUploadPartSize(tt.filesize)
+ require.ErrorIs(t, err, tt.err)
+ require.Equal(t, tt.want, partSize)
+ })
+ }
+}
diff --git a/go/vt/proto/binlogdata/binlogdata.pb.go b/go/vt/proto/binlogdata/binlogdata.pb.go
index 35e738f772e..e3523b6b384 100644
--- a/go/vt/proto/binlogdata/binlogdata.pb.go
+++ b/go/vt/proto/binlogdata/binlogdata.pb.go
@@ -1333,8 +1333,17 @@ type RowChange struct {
Before *query.Row `protobuf:"bytes,1,opt,name=before,proto3" json:"before,omitempty"`
After *query.Row `protobuf:"bytes,2,opt,name=after,proto3" json:"after,omitempty"`
- // DataColumns is a bitmap of all columns: bit is set if column is present in the after image
+ // DataColumns is a bitmap of all columns: bit is set if column is
+ // present in the after image.
DataColumns *RowChange_Bitmap `protobuf:"bytes,3,opt,name=data_columns,json=dataColumns,proto3" json:"data_columns,omitempty"`
+ // JsonPartialValues is a bitmap of any JSON columns, where the bit
+ // is set if the value in the AFTER image is a partial JSON value
+ // that is represented as an expression of
+ // JSON_[INSERT|REPLACE|REMOVE](%s, '$.path', value) which then is
+ // used to add/update/remove a path in the JSON document. When the
+ // value is used the fmt directive must be replaced by the actual
+ // column name of the JSON field.
+ JsonPartialValues *RowChange_Bitmap `protobuf:"bytes,4,opt,name=json_partial_values,json=jsonPartialValues,proto3" json:"json_partial_values,omitempty"`
}
func (x *RowChange) Reset() {
@@ -1388,6 +1397,13 @@ func (x *RowChange) GetDataColumns() *RowChange_Bitmap {
return nil
}
+func (x *RowChange) GetJsonPartialValues() *RowChange_Bitmap {
+ if x != nil {
+ return x.JsonPartialValues
+ }
+ return nil
+}
+
// RowEvent represent row events for one table.
type RowEvent struct {
state protoimpl.MessageState
@@ -3223,7 +3239,7 @@ var file_binlogdata_proto_rawDesc = []byte{
0x65, 0x5a, 0x6f, 0x6e, 0x65, 0x12, 0x28, 0x0a, 0x10, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x5f,
0x74, 0x69, 0x6d, 0x65, 0x5f, 0x7a, 0x6f, 0x6e, 0x65, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x09, 0x52,
0x0e, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x5a, 0x6f, 0x6e, 0x65, 0x22,
- 0xc6, 0x01, 0x0a, 0x09, 0x52, 0x6f, 0x77, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x12, 0x22, 0x0a,
+ 0x94, 0x02, 0x0a, 0x09, 0x52, 0x6f, 0x77, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x12, 0x22, 0x0a,
0x06, 0x62, 0x65, 0x66, 0x6f, 0x72, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e,
0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x52, 0x6f, 0x77, 0x52, 0x06, 0x62, 0x65, 0x66, 0x6f, 0x72,
0x65, 0x12, 0x20, 0x0a, 0x05, 0x61, 0x66, 0x74, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b,
@@ -3232,313 +3248,318 @@ var file_binlogdata_proto_rawDesc = []byte{
0x6d, 0x6e, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x62, 0x69, 0x6e, 0x6c,
0x6f, 0x67, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x52, 0x6f, 0x77, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65,
0x2e, 0x42, 0x69, 0x74, 0x6d, 0x61, 0x70, 0x52, 0x0b, 0x64, 0x61, 0x74, 0x61, 0x43, 0x6f, 0x6c,
- 0x75, 0x6d, 0x6e, 0x73, 0x1a, 0x32, 0x0a, 0x06, 0x42, 0x69, 0x74, 0x6d, 0x61, 0x70, 0x12, 0x14,
- 0x0a, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x63,
- 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x63, 0x6f, 0x6c, 0x73, 0x18, 0x02, 0x20, 0x01,
- 0x28, 0x0c, 0x52, 0x04, 0x63, 0x6f, 0x6c, 0x73, 0x22, 0xd5, 0x01, 0x0a, 0x08, 0x52, 0x6f, 0x77,
- 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x1d, 0x0a, 0x0a, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x6e,
- 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x74, 0x61, 0x62, 0x6c, 0x65,
- 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x36, 0x0a, 0x0b, 0x72, 0x6f, 0x77, 0x5f, 0x63, 0x68, 0x61, 0x6e,
- 0x67, 0x65, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x62, 0x69, 0x6e, 0x6c,
- 0x6f, 0x67, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x52, 0x6f, 0x77, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65,
- 0x52, 0x0a, 0x72, 0x6f, 0x77, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x73, 0x12, 0x1a, 0x0a, 0x08,
- 0x6b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08,
- 0x6b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x68, 0x61, 0x72,
- 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x73, 0x68, 0x61, 0x72, 0x64, 0x12, 0x14,
- 0x0a, 0x05, 0x66, 0x6c, 0x61, 0x67, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x05, 0x66,
- 0x6c, 0x61, 0x67, 0x73, 0x12, 0x2a, 0x0a, 0x11, 0x69, 0x73, 0x5f, 0x69, 0x6e, 0x74, 0x65, 0x72,
- 0x6e, 0x61, 0x6c, 0x5f, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x08, 0x52,
- 0x0f, 0x69, 0x73, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x54, 0x61, 0x62, 0x6c, 0x65,
- 0x22, 0xe4, 0x01, 0x0a, 0x0a, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12,
- 0x1d, 0x0a, 0x0a, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20,
- 0x01, 0x28, 0x09, 0x52, 0x09, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x24,
- 0x0a, 0x06, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0c,
- 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x52, 0x06, 0x66, 0x69,
- 0x65, 0x6c, 0x64, 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x6b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65,
- 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x6b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65,
- 0x12, 0x14, 0x0a, 0x05, 0x73, 0x68, 0x61, 0x72, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52,
- 0x05, 0x73, 0x68, 0x61, 0x72, 0x64, 0x12, 0x33, 0x0a, 0x16, 0x65, 0x6e, 0x75, 0x6d, 0x5f, 0x73,
- 0x65, 0x74, 0x5f, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x73,
- 0x18, 0x19, 0x20, 0x01, 0x28, 0x08, 0x52, 0x13, 0x65, 0x6e, 0x75, 0x6d, 0x53, 0x65, 0x74, 0x53,
- 0x74, 0x72, 0x69, 0x6e, 0x67, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x73, 0x12, 0x2a, 0x0a, 0x11, 0x69,
- 0x73, 0x5f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x5f, 0x74, 0x61, 0x62, 0x6c, 0x65,
- 0x18, 0x1a, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0f, 0x69, 0x73, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e,
- 0x61, 0x6c, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x22, 0x88, 0x01, 0x0a, 0x09, 0x53, 0x68, 0x61, 0x72,
- 0x64, 0x47, 0x74, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x6b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63,
- 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x6b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63,
- 0x65, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x68, 0x61, 0x72, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
- 0x52, 0x05, 0x73, 0x68, 0x61, 0x72, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x67, 0x74, 0x69, 0x64, 0x18,
- 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x67, 0x74, 0x69, 0x64, 0x12, 0x35, 0x0a, 0x0a, 0x74,
- 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x70, 0x5f, 0x6b, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32,
- 0x17, 0x2e, 0x62, 0x69, 0x6e, 0x6c, 0x6f, 0x67, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x54, 0x61, 0x62,
- 0x6c, 0x65, 0x4c, 0x61, 0x73, 0x74, 0x50, 0x4b, 0x52, 0x08, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x50,
- 0x4b, 0x73, 0x22, 0x3f, 0x0a, 0x05, 0x56, 0x47, 0x74, 0x69, 0x64, 0x12, 0x36, 0x0a, 0x0b, 0x73,
- 0x68, 0x61, 0x72, 0x64, 0x5f, 0x67, 0x74, 0x69, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b,
- 0x32, 0x15, 0x2e, 0x62, 0x69, 0x6e, 0x6c, 0x6f, 0x67, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x53, 0x68,
- 0x61, 0x72, 0x64, 0x47, 0x74, 0x69, 0x64, 0x52, 0x0a, 0x73, 0x68, 0x61, 0x72, 0x64, 0x47, 0x74,
- 0x69, 0x64, 0x73, 0x22, 0x41, 0x0a, 0x0d, 0x4b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x53,
- 0x68, 0x61, 0x72, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x6b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65,
- 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x6b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65,
- 0x12, 0x14, 0x0a, 0x05, 0x73, 0x68, 0x61, 0x72, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52,
- 0x05, 0x73, 0x68, 0x61, 0x72, 0x64, 0x22, 0xbc, 0x02, 0x0a, 0x07, 0x4a, 0x6f, 0x75, 0x72, 0x6e,
- 0x61, 0x6c, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x02,
- 0x69, 0x64, 0x12, 0x40, 0x0a, 0x0e, 0x6d, 0x69, 0x67, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f,
- 0x74, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x19, 0x2e, 0x62, 0x69, 0x6e,
- 0x6c, 0x6f, 0x67, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x4d, 0x69, 0x67, 0x72, 0x61, 0x74, 0x69, 0x6f,
- 0x6e, 0x54, 0x79, 0x70, 0x65, 0x52, 0x0d, 0x6d, 0x69, 0x67, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e,
- 0x54, 0x79, 0x70, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x18, 0x03,
- 0x20, 0x03, 0x28, 0x09, 0x52, 0x06, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x12, 0x25, 0x0a, 0x0e,
- 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x5f, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x04,
- 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x50, 0x6f, 0x73, 0x69, 0x74,
- 0x69, 0x6f, 0x6e, 0x12, 0x36, 0x0a, 0x0b, 0x73, 0x68, 0x61, 0x72, 0x64, 0x5f, 0x67, 0x74, 0x69,
- 0x64, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x62, 0x69, 0x6e, 0x6c, 0x6f,
- 0x67, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x53, 0x68, 0x61, 0x72, 0x64, 0x47, 0x74, 0x69, 0x64, 0x52,
- 0x0a, 0x73, 0x68, 0x61, 0x72, 0x64, 0x47, 0x74, 0x69, 0x64, 0x73, 0x12, 0x3d, 0x0a, 0x0c, 0x70,
- 0x61, 0x72, 0x74, 0x69, 0x63, 0x69, 0x70, 0x61, 0x6e, 0x74, 0x73, 0x18, 0x06, 0x20, 0x03, 0x28,
- 0x0b, 0x32, 0x19, 0x2e, 0x62, 0x69, 0x6e, 0x6c, 0x6f, 0x67, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x4b,
- 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x53, 0x68, 0x61, 0x72, 0x64, 0x52, 0x0c, 0x70, 0x61,
- 0x72, 0x74, 0x69, 0x63, 0x69, 0x70, 0x61, 0x6e, 0x74, 0x73, 0x12, 0x29, 0x0a, 0x10, 0x73, 0x6f,
- 0x75, 0x72, 0x63, 0x65, 0x5f, 0x77, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x73, 0x18, 0x07,
- 0x20, 0x03, 0x28, 0x09, 0x52, 0x0f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x57, 0x6f, 0x72, 0x6b,
- 0x66, 0x6c, 0x6f, 0x77, 0x73, 0x22, 0xb6, 0x04, 0x0a, 0x06, 0x56, 0x45, 0x76, 0x65, 0x6e, 0x74,
- 0x12, 0x2a, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x16,
+ 0x75, 0x6d, 0x6e, 0x73, 0x12, 0x4c, 0x0a, 0x13, 0x6a, 0x73, 0x6f, 0x6e, 0x5f, 0x70, 0x61, 0x72,
+ 0x74, 0x69, 0x61, 0x6c, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28,
+ 0x0b, 0x32, 0x1c, 0x2e, 0x62, 0x69, 0x6e, 0x6c, 0x6f, 0x67, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x52,
+ 0x6f, 0x77, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x2e, 0x42, 0x69, 0x74, 0x6d, 0x61, 0x70, 0x52,
+ 0x11, 0x6a, 0x73, 0x6f, 0x6e, 0x50, 0x61, 0x72, 0x74, 0x69, 0x61, 0x6c, 0x56, 0x61, 0x6c, 0x75,
+ 0x65, 0x73, 0x1a, 0x32, 0x0a, 0x06, 0x42, 0x69, 0x74, 0x6d, 0x61, 0x70, 0x12, 0x14, 0x0a, 0x05,
+ 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x63, 0x6f, 0x75,
+ 0x6e, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x63, 0x6f, 0x6c, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c,
+ 0x52, 0x04, 0x63, 0x6f, 0x6c, 0x73, 0x22, 0xd5, 0x01, 0x0a, 0x08, 0x52, 0x6f, 0x77, 0x45, 0x76,
+ 0x65, 0x6e, 0x74, 0x12, 0x1d, 0x0a, 0x0a, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x6e, 0x61, 0x6d,
+ 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x4e, 0x61,
+ 0x6d, 0x65, 0x12, 0x36, 0x0a, 0x0b, 0x72, 0x6f, 0x77, 0x5f, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65,
+ 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x62, 0x69, 0x6e, 0x6c, 0x6f, 0x67,
+ 0x64, 0x61, 0x74, 0x61, 0x2e, 0x52, 0x6f, 0x77, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x52, 0x0a,
+ 0x72, 0x6f, 0x77, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x6b, 0x65,
+ 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x6b, 0x65,
+ 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x68, 0x61, 0x72, 0x64, 0x18,
+ 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x73, 0x68, 0x61, 0x72, 0x64, 0x12, 0x14, 0x0a, 0x05,
+ 0x66, 0x6c, 0x61, 0x67, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x05, 0x66, 0x6c, 0x61,
+ 0x67, 0x73, 0x12, 0x2a, 0x0a, 0x11, 0x69, 0x73, 0x5f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61,
+ 0x6c, 0x5f, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0f, 0x69,
+ 0x73, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x22, 0xe4,
+ 0x01, 0x0a, 0x0a, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x1d, 0x0a,
+ 0x0a, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28,
+ 0x09, 0x52, 0x09, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x24, 0x0a, 0x06,
+ 0x66, 0x69, 0x65, 0x6c, 0x64, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x71,
+ 0x75, 0x65, 0x72, 0x79, 0x2e, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x52, 0x06, 0x66, 0x69, 0x65, 0x6c,
+ 0x64, 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x6b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x18, 0x03,
+ 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x6b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x12, 0x14,
+ 0x0a, 0x05, 0x73, 0x68, 0x61, 0x72, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x73,
+ 0x68, 0x61, 0x72, 0x64, 0x12, 0x33, 0x0a, 0x16, 0x65, 0x6e, 0x75, 0x6d, 0x5f, 0x73, 0x65, 0x74,
+ 0x5f, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x73, 0x18, 0x19,
+ 0x20, 0x01, 0x28, 0x08, 0x52, 0x13, 0x65, 0x6e, 0x75, 0x6d, 0x53, 0x65, 0x74, 0x53, 0x74, 0x72,
+ 0x69, 0x6e, 0x67, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x73, 0x12, 0x2a, 0x0a, 0x11, 0x69, 0x73, 0x5f,
+ 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x5f, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x18, 0x1a,
+ 0x20, 0x01, 0x28, 0x08, 0x52, 0x0f, 0x69, 0x73, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c,
+ 0x54, 0x61, 0x62, 0x6c, 0x65, 0x22, 0x88, 0x01, 0x0a, 0x09, 0x53, 0x68, 0x61, 0x72, 0x64, 0x47,
+ 0x74, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x6b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x18,
+ 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x6b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x12,
+ 0x14, 0x0a, 0x05, 0x73, 0x68, 0x61, 0x72, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05,
+ 0x73, 0x68, 0x61, 0x72, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x67, 0x74, 0x69, 0x64, 0x18, 0x03, 0x20,
+ 0x01, 0x28, 0x09, 0x52, 0x04, 0x67, 0x74, 0x69, 0x64, 0x12, 0x35, 0x0a, 0x0a, 0x74, 0x61, 0x62,
+ 0x6c, 0x65, 0x5f, 0x70, 0x5f, 0x6b, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e,
+ 0x62, 0x69, 0x6e, 0x6c, 0x6f, 0x67, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x54, 0x61, 0x62, 0x6c, 0x65,
+ 0x4c, 0x61, 0x73, 0x74, 0x50, 0x4b, 0x52, 0x08, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x50, 0x4b, 0x73,
+ 0x22, 0x3f, 0x0a, 0x05, 0x56, 0x47, 0x74, 0x69, 0x64, 0x12, 0x36, 0x0a, 0x0b, 0x73, 0x68, 0x61,
+ 0x72, 0x64, 0x5f, 0x67, 0x74, 0x69, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x15,
+ 0x2e, 0x62, 0x69, 0x6e, 0x6c, 0x6f, 0x67, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x53, 0x68, 0x61, 0x72,
+ 0x64, 0x47, 0x74, 0x69, 0x64, 0x52, 0x0a, 0x73, 0x68, 0x61, 0x72, 0x64, 0x47, 0x74, 0x69, 0x64,
+ 0x73, 0x22, 0x41, 0x0a, 0x0d, 0x4b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x53, 0x68, 0x61,
+ 0x72, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x6b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x18, 0x01,
+ 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x6b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x12, 0x14,
+ 0x0a, 0x05, 0x73, 0x68, 0x61, 0x72, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x73,
+ 0x68, 0x61, 0x72, 0x64, 0x22, 0xbc, 0x02, 0x0a, 0x07, 0x4a, 0x6f, 0x75, 0x72, 0x6e, 0x61, 0x6c,
+ 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x02, 0x69, 0x64,
+ 0x12, 0x40, 0x0a, 0x0e, 0x6d, 0x69, 0x67, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x74, 0x79,
+ 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x19, 0x2e, 0x62, 0x69, 0x6e, 0x6c, 0x6f,
+ 0x67, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x4d, 0x69, 0x67, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x54,
+ 0x79, 0x70, 0x65, 0x52, 0x0d, 0x6d, 0x69, 0x67, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x79,
+ 0x70, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x18, 0x03, 0x20, 0x03,
+ 0x28, 0x09, 0x52, 0x06, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x12, 0x25, 0x0a, 0x0e, 0x6c, 0x6f,
+ 0x63, 0x61, 0x6c, 0x5f, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x04, 0x20, 0x01,
+ 0x28, 0x09, 0x52, 0x0d, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x50, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f,
+ 0x6e, 0x12, 0x36, 0x0a, 0x0b, 0x73, 0x68, 0x61, 0x72, 0x64, 0x5f, 0x67, 0x74, 0x69, 0x64, 0x73,
+ 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x62, 0x69, 0x6e, 0x6c, 0x6f, 0x67, 0x64,
+ 0x61, 0x74, 0x61, 0x2e, 0x53, 0x68, 0x61, 0x72, 0x64, 0x47, 0x74, 0x69, 0x64, 0x52, 0x0a, 0x73,
+ 0x68, 0x61, 0x72, 0x64, 0x47, 0x74, 0x69, 0x64, 0x73, 0x12, 0x3d, 0x0a, 0x0c, 0x70, 0x61, 0x72,
+ 0x74, 0x69, 0x63, 0x69, 0x70, 0x61, 0x6e, 0x74, 0x73, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32,
+ 0x19, 0x2e, 0x62, 0x69, 0x6e, 0x6c, 0x6f, 0x67, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x4b, 0x65, 0x79,
+ 0x73, 0x70, 0x61, 0x63, 0x65, 0x53, 0x68, 0x61, 0x72, 0x64, 0x52, 0x0c, 0x70, 0x61, 0x72, 0x74,
+ 0x69, 0x63, 0x69, 0x70, 0x61, 0x6e, 0x74, 0x73, 0x12, 0x29, 0x0a, 0x10, 0x73, 0x6f, 0x75, 0x72,
+ 0x63, 0x65, 0x5f, 0x77, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x73, 0x18, 0x07, 0x20, 0x03,
+ 0x28, 0x09, 0x52, 0x0f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x57, 0x6f, 0x72, 0x6b, 0x66, 0x6c,
+ 0x6f, 0x77, 0x73, 0x22, 0xb6, 0x04, 0x0a, 0x06, 0x56, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x2a,
+ 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x16, 0x2e, 0x62,
+ 0x69, 0x6e, 0x6c, 0x6f, 0x67, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x56, 0x45, 0x76, 0x65, 0x6e, 0x74,
+ 0x54, 0x79, 0x70, 0x65, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x74, 0x69,
+ 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x74,
+ 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x12, 0x12, 0x0a, 0x04, 0x67, 0x74, 0x69, 0x64,
+ 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x67, 0x74, 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x09,
+ 0x73, 0x74, 0x61, 0x74, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52,
+ 0x09, 0x73, 0x74, 0x61, 0x74, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x31, 0x0a, 0x09, 0x72, 0x6f,
+ 0x77, 0x5f, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e,
+ 0x62, 0x69, 0x6e, 0x6c, 0x6f, 0x67, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x52, 0x6f, 0x77, 0x45, 0x76,
+ 0x65, 0x6e, 0x74, 0x52, 0x08, 0x72, 0x6f, 0x77, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x37, 0x0a,
+ 0x0b, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x5f, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x18, 0x06, 0x20, 0x01,
+ 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x62, 0x69, 0x6e, 0x6c, 0x6f, 0x67, 0x64, 0x61, 0x74, 0x61, 0x2e,
+ 0x46, 0x69, 0x65, 0x6c, 0x64, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x52, 0x0a, 0x66, 0x69, 0x65, 0x6c,
+ 0x64, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x27, 0x0a, 0x05, 0x76, 0x67, 0x74, 0x69, 0x64, 0x18,
+ 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x62, 0x69, 0x6e, 0x6c, 0x6f, 0x67, 0x64, 0x61,
+ 0x74, 0x61, 0x2e, 0x56, 0x47, 0x74, 0x69, 0x64, 0x52, 0x05, 0x76, 0x67, 0x74, 0x69, 0x64, 0x12,
+ 0x2d, 0x0a, 0x07, 0x6a, 0x6f, 0x75, 0x72, 0x6e, 0x61, 0x6c, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b,
+ 0x32, 0x13, 0x2e, 0x62, 0x69, 0x6e, 0x6c, 0x6f, 0x67, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x4a, 0x6f,
+ 0x75, 0x72, 0x6e, 0x61, 0x6c, 0x52, 0x07, 0x6a, 0x6f, 0x75, 0x72, 0x6e, 0x61, 0x6c, 0x12, 0x10,
+ 0x0a, 0x03, 0x64, 0x6d, 0x6c, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x64, 0x6d, 0x6c,
+ 0x12, 0x21, 0x0a, 0x0c, 0x63, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x74, 0x5f, 0x74, 0x69, 0x6d, 0x65,
+ 0x18, 0x14, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0b, 0x63, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x74, 0x54,
+ 0x69, 0x6d, 0x65, 0x12, 0x3c, 0x0a, 0x0e, 0x6c, 0x61, 0x73, 0x74, 0x5f, 0x70, 0x5f, 0x6b, 0x5f,
+ 0x65, 0x76, 0x65, 0x6e, 0x74, 0x18, 0x15, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x62, 0x69,
+ 0x6e, 0x6c, 0x6f, 0x67, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x4c, 0x61, 0x73, 0x74, 0x50, 0x4b, 0x45,
+ 0x76, 0x65, 0x6e, 0x74, 0x52, 0x0b, 0x6c, 0x61, 0x73, 0x74, 0x50, 0x4b, 0x45, 0x76, 0x65, 0x6e,
+ 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x6b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x18, 0x16, 0x20,
+ 0x01, 0x28, 0x09, 0x52, 0x08, 0x6b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x12, 0x14, 0x0a,
+ 0x05, 0x73, 0x68, 0x61, 0x72, 0x64, 0x18, 0x17, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x73, 0x68,
+ 0x61, 0x72, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x74, 0x68, 0x72, 0x6f, 0x74, 0x74, 0x6c, 0x65, 0x64,
+ 0x18, 0x18, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x74, 0x68, 0x72, 0x6f, 0x74, 0x74, 0x6c, 0x65,
+ 0x64, 0x12, 0x29, 0x0a, 0x10, 0x74, 0x68, 0x72, 0x6f, 0x74, 0x74, 0x6c, 0x65, 0x64, 0x5f, 0x72,
+ 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x18, 0x19, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0f, 0x74, 0x68, 0x72,
+ 0x6f, 0x74, 0x74, 0x6c, 0x65, 0x64, 0x52, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x22, 0x8d, 0x01, 0x0a,
+ 0x0c, 0x4d, 0x69, 0x6e, 0x69, 0x6d, 0x61, 0x6c, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x12, 0x12, 0x0a,
+ 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d,
+ 0x65, 0x12, 0x24, 0x0a, 0x06, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28,
+ 0x0b, 0x32, 0x0c, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x52,
+ 0x06, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x73, 0x12, 0x1e, 0x0a, 0x0b, 0x70, 0x5f, 0x6b, 0x5f, 0x63,
+ 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x03, 0x52, 0x09, 0x70, 0x4b,
+ 0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x12, 0x23, 0x0a, 0x0e, 0x70, 0x5f, 0x6b, 0x5f, 0x69,
+ 0x6e, 0x64, 0x65, 0x78, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52,
+ 0x0b, 0x70, 0x4b, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x4e, 0x61, 0x6d, 0x65, 0x22, 0x41, 0x0a, 0x0d,
+ 0x4d, 0x69, 0x6e, 0x69, 0x6d, 0x61, 0x6c, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x12, 0x30, 0x0a,
+ 0x06, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x18, 0x2e,
+ 0x62, 0x69, 0x6e, 0x6c, 0x6f, 0x67, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x4d, 0x69, 0x6e, 0x69, 0x6d,
+ 0x61, 0x6c, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x06, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x22,
+ 0xd9, 0x01, 0x0a, 0x0e, 0x56, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x4f, 0x70, 0x74, 0x69, 0x6f,
+ 0x6e, 0x73, 0x12, 0x27, 0x0a, 0x0f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x5f, 0x74,
+ 0x61, 0x62, 0x6c, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0e, 0x69, 0x6e, 0x74,
+ 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x12, 0x5a, 0x0a, 0x10, 0x63,
+ 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x5f, 0x6f, 0x76, 0x65, 0x72, 0x72, 0x69, 0x64, 0x65, 0x73, 0x18,
+ 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2f, 0x2e, 0x62, 0x69, 0x6e, 0x6c, 0x6f, 0x67, 0x64, 0x61,
+ 0x74, 0x61, 0x2e, 0x56, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e,
+ 0x73, 0x2e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x4f, 0x76, 0x65, 0x72, 0x72, 0x69, 0x64, 0x65,
+ 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x4f, 0x76,
+ 0x65, 0x72, 0x72, 0x69, 0x64, 0x65, 0x73, 0x1a, 0x42, 0x0a, 0x14, 0x43, 0x6f, 0x6e, 0x66, 0x69,
+ 0x67, 0x4f, 0x76, 0x65, 0x72, 0x72, 0x69, 0x64, 0x65, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12,
+ 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65,
+ 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
+ 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xfd, 0x02, 0x0a, 0x0e,
+ 0x56, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x3f,
+ 0x0a, 0x13, 0x65, 0x66, 0x66, 0x65, 0x63, 0x74, 0x69, 0x76, 0x65, 0x5f, 0x63, 0x61, 0x6c, 0x6c,
+ 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x76, 0x74,
+ 0x72, 0x70, 0x63, 0x2e, 0x43, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x44, 0x52, 0x11, 0x65, 0x66,
+ 0x66, 0x65, 0x63, 0x74, 0x69, 0x76, 0x65, 0x43, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x64, 0x12,
+ 0x45, 0x0a, 0x13, 0x69, 0x6d, 0x6d, 0x65, 0x64, 0x69, 0x61, 0x74, 0x65, 0x5f, 0x63, 0x61, 0x6c,
+ 0x6c, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x71,
+ 0x75, 0x65, 0x72, 0x79, 0x2e, 0x56, 0x54, 0x47, 0x61, 0x74, 0x65, 0x43, 0x61, 0x6c, 0x6c, 0x65,
+ 0x72, 0x49, 0x44, 0x52, 0x11, 0x69, 0x6d, 0x6d, 0x65, 0x64, 0x69, 0x61, 0x74, 0x65, 0x43, 0x61,
+ 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x64, 0x12, 0x25, 0x0a, 0x06, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74,
+ 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x54,
+ 0x61, 0x72, 0x67, 0x65, 0x74, 0x52, 0x06, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x12, 0x1a, 0x0a,
+ 0x08, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52,
+ 0x08, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x2a, 0x0a, 0x06, 0x66, 0x69, 0x6c,
+ 0x74, 0x65, 0x72, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x62, 0x69, 0x6e, 0x6c,
+ 0x6f, 0x67, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x52, 0x06, 0x66,
+ 0x69, 0x6c, 0x74, 0x65, 0x72, 0x12, 0x3e, 0x0a, 0x0f, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x6c,
+ 0x61, 0x73, 0x74, 0x5f, 0x70, 0x5f, 0x6b, 0x73, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x17,
+ 0x2e, 0x62, 0x69, 0x6e, 0x6c, 0x6f, 0x67, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x54, 0x61, 0x62, 0x6c,
+ 0x65, 0x4c, 0x61, 0x73, 0x74, 0x50, 0x4b, 0x52, 0x0c, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x4c, 0x61,
+ 0x73, 0x74, 0x50, 0x4b, 0x73, 0x12, 0x34, 0x0a, 0x07, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73,
+ 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x62, 0x69, 0x6e, 0x6c, 0x6f, 0x67, 0x64,
+ 0x61, 0x74, 0x61, 0x2e, 0x56, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x4f, 0x70, 0x74, 0x69, 0x6f,
+ 0x6e, 0x73, 0x52, 0x07, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x3d, 0x0a, 0x0f, 0x56,
+ 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x2a,
+ 0x0a, 0x06, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x12,
0x2e, 0x62, 0x69, 0x6e, 0x6c, 0x6f, 0x67, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x56, 0x45, 0x76, 0x65,
- 0x6e, 0x74, 0x54, 0x79, 0x70, 0x65, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x1c, 0x0a, 0x09,
- 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52,
- 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x12, 0x12, 0x0a, 0x04, 0x67, 0x74,
- 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x67, 0x74, 0x69, 0x64, 0x12, 0x1c,
- 0x0a, 0x09, 0x73, 0x74, 0x61, 0x74, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28,
- 0x09, 0x52, 0x09, 0x73, 0x74, 0x61, 0x74, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x31, 0x0a, 0x09,
- 0x72, 0x6f, 0x77, 0x5f, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32,
- 0x14, 0x2e, 0x62, 0x69, 0x6e, 0x6c, 0x6f, 0x67, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x52, 0x6f, 0x77,
- 0x45, 0x76, 0x65, 0x6e, 0x74, 0x52, 0x08, 0x72, 0x6f, 0x77, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12,
- 0x37, 0x0a, 0x0b, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x5f, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x18, 0x06,
- 0x20, 0x01, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x62, 0x69, 0x6e, 0x6c, 0x6f, 0x67, 0x64, 0x61, 0x74,
- 0x61, 0x2e, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x52, 0x0a, 0x66, 0x69,
- 0x65, 0x6c, 0x64, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x27, 0x0a, 0x05, 0x76, 0x67, 0x74, 0x69,
- 0x64, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x62, 0x69, 0x6e, 0x6c, 0x6f, 0x67,
- 0x64, 0x61, 0x74, 0x61, 0x2e, 0x56, 0x47, 0x74, 0x69, 0x64, 0x52, 0x05, 0x76, 0x67, 0x74, 0x69,
- 0x64, 0x12, 0x2d, 0x0a, 0x07, 0x6a, 0x6f, 0x75, 0x72, 0x6e, 0x61, 0x6c, 0x18, 0x08, 0x20, 0x01,
- 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x62, 0x69, 0x6e, 0x6c, 0x6f, 0x67, 0x64, 0x61, 0x74, 0x61, 0x2e,
- 0x4a, 0x6f, 0x75, 0x72, 0x6e, 0x61, 0x6c, 0x52, 0x07, 0x6a, 0x6f, 0x75, 0x72, 0x6e, 0x61, 0x6c,
- 0x12, 0x10, 0x0a, 0x03, 0x64, 0x6d, 0x6c, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x64,
- 0x6d, 0x6c, 0x12, 0x21, 0x0a, 0x0c, 0x63, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x74, 0x5f, 0x74, 0x69,
- 0x6d, 0x65, 0x18, 0x14, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0b, 0x63, 0x75, 0x72, 0x72, 0x65, 0x6e,
- 0x74, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x3c, 0x0a, 0x0e, 0x6c, 0x61, 0x73, 0x74, 0x5f, 0x70, 0x5f,
- 0x6b, 0x5f, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x18, 0x15, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e,
- 0x62, 0x69, 0x6e, 0x6c, 0x6f, 0x67, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x4c, 0x61, 0x73, 0x74, 0x50,
- 0x4b, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x52, 0x0b, 0x6c, 0x61, 0x73, 0x74, 0x50, 0x4b, 0x45, 0x76,
- 0x65, 0x6e, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x6b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x18,
- 0x16, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x6b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x12,
- 0x14, 0x0a, 0x05, 0x73, 0x68, 0x61, 0x72, 0x64, 0x18, 0x17, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05,
- 0x73, 0x68, 0x61, 0x72, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x74, 0x68, 0x72, 0x6f, 0x74, 0x74, 0x6c,
- 0x65, 0x64, 0x18, 0x18, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x74, 0x68, 0x72, 0x6f, 0x74, 0x74,
- 0x6c, 0x65, 0x64, 0x12, 0x29, 0x0a, 0x10, 0x74, 0x68, 0x72, 0x6f, 0x74, 0x74, 0x6c, 0x65, 0x64,
- 0x5f, 0x72, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x18, 0x19, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0f, 0x74,
- 0x68, 0x72, 0x6f, 0x74, 0x74, 0x6c, 0x65, 0x64, 0x52, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x22, 0x8d,
- 0x01, 0x0a, 0x0c, 0x4d, 0x69, 0x6e, 0x69, 0x6d, 0x61, 0x6c, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x12,
- 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e,
- 0x61, 0x6d, 0x65, 0x12, 0x24, 0x0a, 0x06, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x73, 0x18, 0x02, 0x20,
- 0x03, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x46, 0x69, 0x65, 0x6c,
- 0x64, 0x52, 0x06, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x73, 0x12, 0x1e, 0x0a, 0x0b, 0x70, 0x5f, 0x6b,
- 0x5f, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x03, 0x52, 0x09,
- 0x70, 0x4b, 0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x12, 0x23, 0x0a, 0x0e, 0x70, 0x5f, 0x6b,
- 0x5f, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28,
- 0x09, 0x52, 0x0b, 0x70, 0x4b, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x4e, 0x61, 0x6d, 0x65, 0x22, 0x41,
- 0x0a, 0x0d, 0x4d, 0x69, 0x6e, 0x69, 0x6d, 0x61, 0x6c, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x12,
- 0x30, 0x0a, 0x06, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32,
- 0x18, 0x2e, 0x62, 0x69, 0x6e, 0x6c, 0x6f, 0x67, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x4d, 0x69, 0x6e,
- 0x69, 0x6d, 0x61, 0x6c, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x06, 0x74, 0x61, 0x62, 0x6c, 0x65,
- 0x73, 0x22, 0xd9, 0x01, 0x0a, 0x0e, 0x56, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x4f, 0x70, 0x74,
- 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x27, 0x0a, 0x0f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c,
- 0x5f, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0e, 0x69,
- 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x12, 0x5a, 0x0a,
- 0x10, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x5f, 0x6f, 0x76, 0x65, 0x72, 0x72, 0x69, 0x64, 0x65,
- 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2f, 0x2e, 0x62, 0x69, 0x6e, 0x6c, 0x6f, 0x67,
- 0x64, 0x61, 0x74, 0x61, 0x2e, 0x56, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x4f, 0x70, 0x74, 0x69,
- 0x6f, 0x6e, 0x73, 0x2e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x4f, 0x76, 0x65, 0x72, 0x72, 0x69,
- 0x64, 0x65, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67,
- 0x4f, 0x76, 0x65, 0x72, 0x72, 0x69, 0x64, 0x65, 0x73, 0x1a, 0x42, 0x0a, 0x14, 0x43, 0x6f, 0x6e,
- 0x66, 0x69, 0x67, 0x4f, 0x76, 0x65, 0x72, 0x72, 0x69, 0x64, 0x65, 0x73, 0x45, 0x6e, 0x74, 0x72,
- 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03,
- 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01,
- 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xfd, 0x02,
- 0x0a, 0x0e, 0x56, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
- 0x12, 0x3f, 0x0a, 0x13, 0x65, 0x66, 0x66, 0x65, 0x63, 0x74, 0x69, 0x76, 0x65, 0x5f, 0x63, 0x61,
- 0x6c, 0x6c, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e,
- 0x76, 0x74, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x44, 0x52, 0x11,
- 0x65, 0x66, 0x66, 0x65, 0x63, 0x74, 0x69, 0x76, 0x65, 0x43, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x49,
- 0x64, 0x12, 0x45, 0x0a, 0x13, 0x69, 0x6d, 0x6d, 0x65, 0x64, 0x69, 0x61, 0x74, 0x65, 0x5f, 0x63,
- 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x15,
- 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x56, 0x54, 0x47, 0x61, 0x74, 0x65, 0x43, 0x61, 0x6c,
- 0x6c, 0x65, 0x72, 0x49, 0x44, 0x52, 0x11, 0x69, 0x6d, 0x6d, 0x65, 0x64, 0x69, 0x61, 0x74, 0x65,
- 0x43, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x64, 0x12, 0x25, 0x0a, 0x06, 0x74, 0x61, 0x72, 0x67,
- 0x65, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79,
- 0x2e, 0x54, 0x61, 0x72, 0x67, 0x65, 0x74, 0x52, 0x06, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x12,
- 0x1a, 0x0a, 0x08, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28,
- 0x09, 0x52, 0x08, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x2a, 0x0a, 0x06, 0x66,
- 0x69, 0x6c, 0x74, 0x65, 0x72, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x62, 0x69,
- 0x6e, 0x6c, 0x6f, 0x67, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x52,
- 0x06, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x12, 0x3e, 0x0a, 0x0f, 0x74, 0x61, 0x62, 0x6c, 0x65,
- 0x5f, 0x6c, 0x61, 0x73, 0x74, 0x5f, 0x70, 0x5f, 0x6b, 0x73, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b,
- 0x32, 0x17, 0x2e, 0x62, 0x69, 0x6e, 0x6c, 0x6f, 0x67, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x54, 0x61,
- 0x62, 0x6c, 0x65, 0x4c, 0x61, 0x73, 0x74, 0x50, 0x4b, 0x52, 0x0c, 0x74, 0x61, 0x62, 0x6c, 0x65,
- 0x4c, 0x61, 0x73, 0x74, 0x50, 0x4b, 0x73, 0x12, 0x34, 0x0a, 0x07, 0x6f, 0x70, 0x74, 0x69, 0x6f,
- 0x6e, 0x73, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x62, 0x69, 0x6e, 0x6c, 0x6f,
+ 0x6e, 0x74, 0x52, 0x06, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x22, 0xbb, 0x02, 0x0a, 0x12, 0x56,
+ 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x52, 0x6f, 0x77, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
+ 0x74, 0x12, 0x3f, 0x0a, 0x13, 0x65, 0x66, 0x66, 0x65, 0x63, 0x74, 0x69, 0x76, 0x65, 0x5f, 0x63,
+ 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f,
+ 0x2e, 0x76, 0x74, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x44, 0x52,
+ 0x11, 0x65, 0x66, 0x66, 0x65, 0x63, 0x74, 0x69, 0x76, 0x65, 0x43, 0x61, 0x6c, 0x6c, 0x65, 0x72,
+ 0x49, 0x64, 0x12, 0x45, 0x0a, 0x13, 0x69, 0x6d, 0x6d, 0x65, 0x64, 0x69, 0x61, 0x74, 0x65, 0x5f,
+ 0x63, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32,
+ 0x15, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x56, 0x54, 0x47, 0x61, 0x74, 0x65, 0x43, 0x61,
+ 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x44, 0x52, 0x11, 0x69, 0x6d, 0x6d, 0x65, 0x64, 0x69, 0x61, 0x74,
+ 0x65, 0x43, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x64, 0x12, 0x25, 0x0a, 0x06, 0x74, 0x61, 0x72,
+ 0x67, 0x65, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x71, 0x75, 0x65, 0x72,
+ 0x79, 0x2e, 0x54, 0x61, 0x72, 0x67, 0x65, 0x74, 0x52, 0x06, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74,
+ 0x12, 0x14, 0x0a, 0x05, 0x71, 0x75, 0x65, 0x72, 0x79, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52,
+ 0x05, 0x71, 0x75, 0x65, 0x72, 0x79, 0x12, 0x2a, 0x0a, 0x06, 0x6c, 0x61, 0x73, 0x74, 0x70, 0x6b,
+ 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x51,
+ 0x75, 0x65, 0x72, 0x79, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x52, 0x06, 0x6c, 0x61, 0x73, 0x74,
+ 0x70, 0x6b, 0x12, 0x34, 0x0a, 0x07, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x06, 0x20,
+ 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x62, 0x69, 0x6e, 0x6c, 0x6f, 0x67, 0x64, 0x61, 0x74, 0x61,
+ 0x2e, 0x56, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52,
+ 0x07, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0xa4, 0x02, 0x0a, 0x13, 0x56, 0x53, 0x74,
+ 0x72, 0x65, 0x61, 0x6d, 0x52, 0x6f, 0x77, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
+ 0x12, 0x24, 0x0a, 0x06, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b,
+ 0x32, 0x0c, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x52, 0x06,
+ 0x66, 0x69, 0x65, 0x6c, 0x64, 0x73, 0x12, 0x28, 0x0a, 0x08, 0x70, 0x6b, 0x66, 0x69, 0x65, 0x6c,
+ 0x64, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79,
+ 0x2e, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x52, 0x08, 0x70, 0x6b, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x73,
+ 0x12, 0x12, 0x0a, 0x04, 0x67, 0x74, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04,
+ 0x67, 0x74, 0x69, 0x64, 0x12, 0x1e, 0x0a, 0x04, 0x72, 0x6f, 0x77, 0x73, 0x18, 0x04, 0x20, 0x03,
+ 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x52, 0x6f, 0x77, 0x52, 0x04,
+ 0x72, 0x6f, 0x77, 0x73, 0x12, 0x22, 0x0a, 0x06, 0x6c, 0x61, 0x73, 0x74, 0x70, 0x6b, 0x18, 0x05,
+ 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x52, 0x6f, 0x77,
+ 0x52, 0x06, 0x6c, 0x61, 0x73, 0x74, 0x70, 0x6b, 0x12, 0x1c, 0x0a, 0x09, 0x74, 0x68, 0x72, 0x6f,
+ 0x74, 0x74, 0x6c, 0x65, 0x64, 0x18, 0x06, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x74, 0x68, 0x72,
+ 0x6f, 0x74, 0x74, 0x6c, 0x65, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x68, 0x65, 0x61, 0x72, 0x74, 0x62,
+ 0x65, 0x61, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x68, 0x65, 0x61, 0x72, 0x74,
+ 0x62, 0x65, 0x61, 0x74, 0x12, 0x29, 0x0a, 0x10, 0x74, 0x68, 0x72, 0x6f, 0x74, 0x74, 0x6c, 0x65,
+ 0x64, 0x5f, 0x72, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0f,
+ 0x74, 0x68, 0x72, 0x6f, 0x74, 0x74, 0x6c, 0x65, 0x64, 0x52, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x22,
+ 0xfb, 0x01, 0x0a, 0x14, 0x56, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x54, 0x61, 0x62, 0x6c, 0x65,
+ 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x3f, 0x0a, 0x13, 0x65, 0x66, 0x66, 0x65,
+ 0x63, 0x74, 0x69, 0x76, 0x65, 0x5f, 0x63, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18,
+ 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x76, 0x74, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x61,
+ 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x44, 0x52, 0x11, 0x65, 0x66, 0x66, 0x65, 0x63, 0x74, 0x69, 0x76,
+ 0x65, 0x43, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x64, 0x12, 0x45, 0x0a, 0x13, 0x69, 0x6d, 0x6d,
+ 0x65, 0x64, 0x69, 0x61, 0x74, 0x65, 0x5f, 0x63, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x5f, 0x69, 0x64,
+ 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x56,
+ 0x54, 0x47, 0x61, 0x74, 0x65, 0x43, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x44, 0x52, 0x11, 0x69,
+ 0x6d, 0x6d, 0x65, 0x64, 0x69, 0x61, 0x74, 0x65, 0x43, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x64,
+ 0x12, 0x25, 0x0a, 0x06, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b,
+ 0x32, 0x0d, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x54, 0x61, 0x72, 0x67, 0x65, 0x74, 0x52,
+ 0x06, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x12, 0x34, 0x0a, 0x07, 0x6f, 0x70, 0x74, 0x69, 0x6f,
+ 0x6e, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x62, 0x69, 0x6e, 0x6c, 0x6f,
0x67, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x56, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x4f, 0x70, 0x74,
- 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x07, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x3d, 0x0a,
- 0x0f, 0x56, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
- 0x12, 0x2a, 0x0a, 0x06, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b,
- 0x32, 0x12, 0x2e, 0x62, 0x69, 0x6e, 0x6c, 0x6f, 0x67, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x56, 0x45,
- 0x76, 0x65, 0x6e, 0x74, 0x52, 0x06, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x22, 0xbb, 0x02, 0x0a,
- 0x12, 0x56, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x52, 0x6f, 0x77, 0x73, 0x52, 0x65, 0x71, 0x75,
- 0x65, 0x73, 0x74, 0x12, 0x3f, 0x0a, 0x13, 0x65, 0x66, 0x66, 0x65, 0x63, 0x74, 0x69, 0x76, 0x65,
- 0x5f, 0x63, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b,
- 0x32, 0x0f, 0x2e, 0x76, 0x74, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x49,
- 0x44, 0x52, 0x11, 0x65, 0x66, 0x66, 0x65, 0x63, 0x74, 0x69, 0x76, 0x65, 0x43, 0x61, 0x6c, 0x6c,
- 0x65, 0x72, 0x49, 0x64, 0x12, 0x45, 0x0a, 0x13, 0x69, 0x6d, 0x6d, 0x65, 0x64, 0x69, 0x61, 0x74,
- 0x65, 0x5f, 0x63, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28,
- 0x0b, 0x32, 0x15, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x56, 0x54, 0x47, 0x61, 0x74, 0x65,
- 0x43, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x44, 0x52, 0x11, 0x69, 0x6d, 0x6d, 0x65, 0x64, 0x69,
- 0x61, 0x74, 0x65, 0x43, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x64, 0x12, 0x25, 0x0a, 0x06, 0x74,
- 0x61, 0x72, 0x67, 0x65, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x71, 0x75,
- 0x65, 0x72, 0x79, 0x2e, 0x54, 0x61, 0x72, 0x67, 0x65, 0x74, 0x52, 0x06, 0x74, 0x61, 0x72, 0x67,
- 0x65, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x71, 0x75, 0x65, 0x72, 0x79, 0x18, 0x04, 0x20, 0x01, 0x28,
- 0x09, 0x52, 0x05, 0x71, 0x75, 0x65, 0x72, 0x79, 0x12, 0x2a, 0x0a, 0x06, 0x6c, 0x61, 0x73, 0x74,
- 0x70, 0x6b, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79,
- 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x52, 0x06, 0x6c, 0x61,
- 0x73, 0x74, 0x70, 0x6b, 0x12, 0x34, 0x0a, 0x07, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18,
- 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x62, 0x69, 0x6e, 0x6c, 0x6f, 0x67, 0x64, 0x61,
- 0x74, 0x61, 0x2e, 0x56, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e,
- 0x73, 0x52, 0x07, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0xa4, 0x02, 0x0a, 0x13, 0x56,
- 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x52, 0x6f, 0x77, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
- 0x73, 0x65, 0x12, 0x24, 0x0a, 0x06, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03,
- 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x46, 0x69, 0x65, 0x6c, 0x64,
- 0x52, 0x06, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x73, 0x12, 0x28, 0x0a, 0x08, 0x70, 0x6b, 0x66, 0x69,
- 0x65, 0x6c, 0x64, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x71, 0x75, 0x65,
- 0x72, 0x79, 0x2e, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x52, 0x08, 0x70, 0x6b, 0x66, 0x69, 0x65, 0x6c,
+ 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x07, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0xde, 0x01,
+ 0x0a, 0x15, 0x56, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x52,
+ 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x1d, 0x0a, 0x0a, 0x74, 0x61, 0x62, 0x6c, 0x65,
+ 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x74, 0x61, 0x62,
+ 0x6c, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x24, 0x0a, 0x06, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x73,
+ 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x46,
+ 0x69, 0x65, 0x6c, 0x64, 0x52, 0x06, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x73, 0x12, 0x28, 0x0a, 0x08,
+ 0x70, 0x6b, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0c,
+ 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x52, 0x08, 0x70, 0x6b,
+ 0x66, 0x69, 0x65, 0x6c, 0x64, 0x73, 0x12, 0x12, 0x0a, 0x04, 0x67, 0x74, 0x69, 0x64, 0x18, 0x04,
+ 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x67, 0x74, 0x69, 0x64, 0x12, 0x1e, 0x0a, 0x04, 0x72, 0x6f,
+ 0x77, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79,
+ 0x2e, 0x52, 0x6f, 0x77, 0x52, 0x04, 0x72, 0x6f, 0x77, 0x73, 0x12, 0x22, 0x0a, 0x06, 0x6c, 0x61,
+ 0x73, 0x74, 0x70, 0x6b, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x71, 0x75, 0x65,
+ 0x72, 0x79, 0x2e, 0x52, 0x6f, 0x77, 0x52, 0x06, 0x6c, 0x61, 0x73, 0x74, 0x70, 0x6b, 0x22, 0x69,
+ 0x0a, 0x0b, 0x4c, 0x61, 0x73, 0x74, 0x50, 0x4b, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x3c, 0x0a,
+ 0x0e, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x6c, 0x61, 0x73, 0x74, 0x5f, 0x70, 0x5f, 0x6b, 0x18,
+ 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x62, 0x69, 0x6e, 0x6c, 0x6f, 0x67, 0x64, 0x61,
+ 0x74, 0x61, 0x2e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x4c, 0x61, 0x73, 0x74, 0x50, 0x4b, 0x52, 0x0b,
+ 0x74, 0x61, 0x62, 0x6c, 0x65, 0x4c, 0x61, 0x73, 0x74, 0x50, 0x4b, 0x12, 0x1c, 0x0a, 0x09, 0x63,
+ 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09,
+ 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x64, 0x22, 0x58, 0x0a, 0x0b, 0x54, 0x61, 0x62,
+ 0x6c, 0x65, 0x4c, 0x61, 0x73, 0x74, 0x50, 0x4b, 0x12, 0x1d, 0x0a, 0x0a, 0x74, 0x61, 0x62, 0x6c,
+ 0x65, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x74, 0x61,
+ 0x62, 0x6c, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x2a, 0x0a, 0x06, 0x6c, 0x61, 0x73, 0x74, 0x70,
+ 0x6b, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e,
+ 0x51, 0x75, 0x65, 0x72, 0x79, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x52, 0x06, 0x6c, 0x61, 0x73,
+ 0x74, 0x70, 0x6b, 0x22, 0xdc, 0x01, 0x0a, 0x15, 0x56, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x52,
+ 0x65, 0x73, 0x75, 0x6c, 0x74, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x3f, 0x0a,
+ 0x13, 0x65, 0x66, 0x66, 0x65, 0x63, 0x74, 0x69, 0x76, 0x65, 0x5f, 0x63, 0x61, 0x6c, 0x6c, 0x65,
+ 0x72, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x76, 0x74, 0x72,
+ 0x70, 0x63, 0x2e, 0x43, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x44, 0x52, 0x11, 0x65, 0x66, 0x66,
+ 0x65, 0x63, 0x74, 0x69, 0x76, 0x65, 0x43, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x64, 0x12, 0x45,
+ 0x0a, 0x13, 0x69, 0x6d, 0x6d, 0x65, 0x64, 0x69, 0x61, 0x74, 0x65, 0x5f, 0x63, 0x61, 0x6c, 0x6c,
+ 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x71, 0x75,
+ 0x65, 0x72, 0x79, 0x2e, 0x56, 0x54, 0x47, 0x61, 0x74, 0x65, 0x43, 0x61, 0x6c, 0x6c, 0x65, 0x72,
+ 0x49, 0x44, 0x52, 0x11, 0x69, 0x6d, 0x6d, 0x65, 0x64, 0x69, 0x61, 0x74, 0x65, 0x43, 0x61, 0x6c,
+ 0x6c, 0x65, 0x72, 0x49, 0x64, 0x12, 0x25, 0x0a, 0x06, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x18,
+ 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x54, 0x61,
+ 0x72, 0x67, 0x65, 0x74, 0x52, 0x06, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x12, 0x14, 0x0a, 0x05,
+ 0x71, 0x75, 0x65, 0x72, 0x79, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x71, 0x75, 0x65,
+ 0x72, 0x79, 0x22, 0x72, 0x0a, 0x16, 0x56, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x52, 0x65, 0x73,
+ 0x75, 0x6c, 0x74, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x24, 0x0a, 0x06,
+ 0x66, 0x69, 0x65, 0x6c, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x71,
+ 0x75, 0x65, 0x72, 0x79, 0x2e, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x52, 0x06, 0x66, 0x69, 0x65, 0x6c,
0x64, 0x73, 0x12, 0x12, 0x0a, 0x04, 0x67, 0x74, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09,
0x52, 0x04, 0x67, 0x74, 0x69, 0x64, 0x12, 0x1e, 0x0a, 0x04, 0x72, 0x6f, 0x77, 0x73, 0x18, 0x04,
0x20, 0x03, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x52, 0x6f, 0x77,
- 0x52, 0x04, 0x72, 0x6f, 0x77, 0x73, 0x12, 0x22, 0x0a, 0x06, 0x6c, 0x61, 0x73, 0x74, 0x70, 0x6b,
- 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x52,
- 0x6f, 0x77, 0x52, 0x06, 0x6c, 0x61, 0x73, 0x74, 0x70, 0x6b, 0x12, 0x1c, 0x0a, 0x09, 0x74, 0x68,
- 0x72, 0x6f, 0x74, 0x74, 0x6c, 0x65, 0x64, 0x18, 0x06, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x74,
- 0x68, 0x72, 0x6f, 0x74, 0x74, 0x6c, 0x65, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x68, 0x65, 0x61, 0x72,
- 0x74, 0x62, 0x65, 0x61, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x68, 0x65, 0x61,
- 0x72, 0x74, 0x62, 0x65, 0x61, 0x74, 0x12, 0x29, 0x0a, 0x10, 0x74, 0x68, 0x72, 0x6f, 0x74, 0x74,
- 0x6c, 0x65, 0x64, 0x5f, 0x72, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09,
- 0x52, 0x0f, 0x74, 0x68, 0x72, 0x6f, 0x74, 0x74, 0x6c, 0x65, 0x64, 0x52, 0x65, 0x61, 0x73, 0x6f,
- 0x6e, 0x22, 0xfb, 0x01, 0x0a, 0x14, 0x56, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x54, 0x61, 0x62,
- 0x6c, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x3f, 0x0a, 0x13, 0x65, 0x66,
- 0x66, 0x65, 0x63, 0x74, 0x69, 0x76, 0x65, 0x5f, 0x63, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x5f, 0x69,
- 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x76, 0x74, 0x72, 0x70, 0x63, 0x2e,
- 0x43, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x44, 0x52, 0x11, 0x65, 0x66, 0x66, 0x65, 0x63, 0x74,
- 0x69, 0x76, 0x65, 0x43, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x64, 0x12, 0x45, 0x0a, 0x13, 0x69,
- 0x6d, 0x6d, 0x65, 0x64, 0x69, 0x61, 0x74, 0x65, 0x5f, 0x63, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x5f,
- 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79,
- 0x2e, 0x56, 0x54, 0x47, 0x61, 0x74, 0x65, 0x43, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x44, 0x52,
- 0x11, 0x69, 0x6d, 0x6d, 0x65, 0x64, 0x69, 0x61, 0x74, 0x65, 0x43, 0x61, 0x6c, 0x6c, 0x65, 0x72,
- 0x49, 0x64, 0x12, 0x25, 0x0a, 0x06, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x18, 0x03, 0x20, 0x01,
- 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x54, 0x61, 0x72, 0x67, 0x65,
- 0x74, 0x52, 0x06, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x12, 0x34, 0x0a, 0x07, 0x6f, 0x70, 0x74,
- 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x62, 0x69, 0x6e,
- 0x6c, 0x6f, 0x67, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x56, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x4f,
- 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x07, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22,
- 0xde, 0x01, 0x0a, 0x15, 0x56, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x54, 0x61, 0x62, 0x6c, 0x65,
- 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x1d, 0x0a, 0x0a, 0x74, 0x61, 0x62,
- 0x6c, 0x65, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x74,
- 0x61, 0x62, 0x6c, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x24, 0x0a, 0x06, 0x66, 0x69, 0x65, 0x6c,
- 0x64, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79,
- 0x2e, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x52, 0x06, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x73, 0x12, 0x28,
- 0x0a, 0x08, 0x70, 0x6b, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b,
- 0x32, 0x0c, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x52, 0x08,
- 0x70, 0x6b, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x73, 0x12, 0x12, 0x0a, 0x04, 0x67, 0x74, 0x69, 0x64,
- 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x67, 0x74, 0x69, 0x64, 0x12, 0x1e, 0x0a, 0x04,
- 0x72, 0x6f, 0x77, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x71, 0x75, 0x65,
- 0x72, 0x79, 0x2e, 0x52, 0x6f, 0x77, 0x52, 0x04, 0x72, 0x6f, 0x77, 0x73, 0x12, 0x22, 0x0a, 0x06,
- 0x6c, 0x61, 0x73, 0x74, 0x70, 0x6b, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x71,
- 0x75, 0x65, 0x72, 0x79, 0x2e, 0x52, 0x6f, 0x77, 0x52, 0x06, 0x6c, 0x61, 0x73, 0x74, 0x70, 0x6b,
- 0x22, 0x69, 0x0a, 0x0b, 0x4c, 0x61, 0x73, 0x74, 0x50, 0x4b, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12,
- 0x3c, 0x0a, 0x0e, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x6c, 0x61, 0x73, 0x74, 0x5f, 0x70, 0x5f,
- 0x6b, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x62, 0x69, 0x6e, 0x6c, 0x6f, 0x67,
- 0x64, 0x61, 0x74, 0x61, 0x2e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x4c, 0x61, 0x73, 0x74, 0x50, 0x4b,
- 0x52, 0x0b, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x4c, 0x61, 0x73, 0x74, 0x50, 0x4b, 0x12, 0x1c, 0x0a,
- 0x09, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08,
- 0x52, 0x09, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x64, 0x22, 0x58, 0x0a, 0x0b, 0x54,
- 0x61, 0x62, 0x6c, 0x65, 0x4c, 0x61, 0x73, 0x74, 0x50, 0x4b, 0x12, 0x1d, 0x0a, 0x0a, 0x74, 0x61,
- 0x62, 0x6c, 0x65, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09,
- 0x74, 0x61, 0x62, 0x6c, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x2a, 0x0a, 0x06, 0x6c, 0x61, 0x73,
- 0x74, 0x70, 0x6b, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x71, 0x75, 0x65, 0x72,
- 0x79, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x52, 0x06, 0x6c,
- 0x61, 0x73, 0x74, 0x70, 0x6b, 0x22, 0xdc, 0x01, 0x0a, 0x15, 0x56, 0x53, 0x74, 0x72, 0x65, 0x61,
- 0x6d, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12,
- 0x3f, 0x0a, 0x13, 0x65, 0x66, 0x66, 0x65, 0x63, 0x74, 0x69, 0x76, 0x65, 0x5f, 0x63, 0x61, 0x6c,
- 0x6c, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x76,
- 0x74, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x44, 0x52, 0x11, 0x65,
- 0x66, 0x66, 0x65, 0x63, 0x74, 0x69, 0x76, 0x65, 0x43, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x64,
- 0x12, 0x45, 0x0a, 0x13, 0x69, 0x6d, 0x6d, 0x65, 0x64, 0x69, 0x61, 0x74, 0x65, 0x5f, 0x63, 0x61,
- 0x6c, 0x6c, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x15, 0x2e,
- 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x56, 0x54, 0x47, 0x61, 0x74, 0x65, 0x43, 0x61, 0x6c, 0x6c,
- 0x65, 0x72, 0x49, 0x44, 0x52, 0x11, 0x69, 0x6d, 0x6d, 0x65, 0x64, 0x69, 0x61, 0x74, 0x65, 0x43,
- 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x64, 0x12, 0x25, 0x0a, 0x06, 0x74, 0x61, 0x72, 0x67, 0x65,
- 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e,
- 0x54, 0x61, 0x72, 0x67, 0x65, 0x74, 0x52, 0x06, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x12, 0x14,
- 0x0a, 0x05, 0x71, 0x75, 0x65, 0x72, 0x79, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x71,
- 0x75, 0x65, 0x72, 0x79, 0x22, 0x72, 0x0a, 0x16, 0x56, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x52,
- 0x65, 0x73, 0x75, 0x6c, 0x74, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x24,
- 0x0a, 0x06, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0c,
- 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x52, 0x06, 0x66, 0x69,
- 0x65, 0x6c, 0x64, 0x73, 0x12, 0x12, 0x0a, 0x04, 0x67, 0x74, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01,
- 0x28, 0x09, 0x52, 0x04, 0x67, 0x74, 0x69, 0x64, 0x12, 0x1e, 0x0a, 0x04, 0x72, 0x6f, 0x77, 0x73,
- 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x52,
- 0x6f, 0x77, 0x52, 0x04, 0x72, 0x6f, 0x77, 0x73, 0x2a, 0x3e, 0x0a, 0x0b, 0x4f, 0x6e, 0x44, 0x44,
- 0x4c, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x0a, 0x0a, 0x06, 0x49, 0x47, 0x4e, 0x4f, 0x52,
- 0x45, 0x10, 0x00, 0x12, 0x08, 0x0a, 0x04, 0x53, 0x54, 0x4f, 0x50, 0x10, 0x01, 0x12, 0x08, 0x0a,
- 0x04, 0x45, 0x58, 0x45, 0x43, 0x10, 0x02, 0x12, 0x0f, 0x0a, 0x0b, 0x45, 0x58, 0x45, 0x43, 0x5f,
- 0x49, 0x47, 0x4e, 0x4f, 0x52, 0x45, 0x10, 0x03, 0x2a, 0x7b, 0x0a, 0x18, 0x56, 0x52, 0x65, 0x70,
- 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x57, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77,
- 0x54, 0x79, 0x70, 0x65, 0x12, 0x0f, 0x0a, 0x0b, 0x4d, 0x61, 0x74, 0x65, 0x72, 0x69, 0x61, 0x6c,
- 0x69, 0x7a, 0x65, 0x10, 0x00, 0x12, 0x0e, 0x0a, 0x0a, 0x4d, 0x6f, 0x76, 0x65, 0x54, 0x61, 0x62,
- 0x6c, 0x65, 0x73, 0x10, 0x01, 0x12, 0x15, 0x0a, 0x11, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4c,
- 0x6f, 0x6f, 0x6b, 0x75, 0x70, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x10, 0x02, 0x12, 0x0b, 0x0a, 0x07,
- 0x4d, 0x69, 0x67, 0x72, 0x61, 0x74, 0x65, 0x10, 0x03, 0x12, 0x0b, 0x0a, 0x07, 0x52, 0x65, 0x73,
- 0x68, 0x61, 0x72, 0x64, 0x10, 0x04, 0x12, 0x0d, 0x0a, 0x09, 0x4f, 0x6e, 0x6c, 0x69, 0x6e, 0x65,
- 0x44, 0x44, 0x4c, 0x10, 0x05, 0x2a, 0x44, 0x0a, 0x1b, 0x56, 0x52, 0x65, 0x70, 0x6c, 0x69, 0x63,
- 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x57, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x53, 0x75, 0x62,
- 0x54, 0x79, 0x70, 0x65, 0x12, 0x08, 0x0a, 0x04, 0x4e, 0x6f, 0x6e, 0x65, 0x10, 0x00, 0x12, 0x0b,
- 0x0a, 0x07, 0x50, 0x61, 0x72, 0x74, 0x69, 0x61, 0x6c, 0x10, 0x01, 0x12, 0x0e, 0x0a, 0x0a, 0x41,
- 0x74, 0x6f, 0x6d, 0x69, 0x63, 0x43, 0x6f, 0x70, 0x79, 0x10, 0x02, 0x2a, 0x71, 0x0a, 0x19, 0x56,
- 0x52, 0x65, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x57, 0x6f, 0x72, 0x6b, 0x66,
- 0x6c, 0x6f, 0x77, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x0b, 0x0a, 0x07, 0x55, 0x6e, 0x6b, 0x6e,
- 0x6f, 0x77, 0x6e, 0x10, 0x00, 0x12, 0x08, 0x0a, 0x04, 0x49, 0x6e, 0x69, 0x74, 0x10, 0x01, 0x12,
- 0x0b, 0x0a, 0x07, 0x53, 0x74, 0x6f, 0x70, 0x70, 0x65, 0x64, 0x10, 0x02, 0x12, 0x0b, 0x0a, 0x07,
- 0x43, 0x6f, 0x70, 0x79, 0x69, 0x6e, 0x67, 0x10, 0x03, 0x12, 0x0b, 0x0a, 0x07, 0x52, 0x75, 0x6e,
- 0x6e, 0x69, 0x6e, 0x67, 0x10, 0x04, 0x12, 0x09, 0x0a, 0x05, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x10,
- 0x05, 0x12, 0x0b, 0x0a, 0x07, 0x4c, 0x61, 0x67, 0x67, 0x69, 0x6e, 0x67, 0x10, 0x06, 0x2a, 0x8d,
- 0x02, 0x0a, 0x0a, 0x56, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x54, 0x79, 0x70, 0x65, 0x12, 0x0b, 0x0a,
- 0x07, 0x55, 0x4e, 0x4b, 0x4e, 0x4f, 0x57, 0x4e, 0x10, 0x00, 0x12, 0x08, 0x0a, 0x04, 0x47, 0x54,
- 0x49, 0x44, 0x10, 0x01, 0x12, 0x09, 0x0a, 0x05, 0x42, 0x45, 0x47, 0x49, 0x4e, 0x10, 0x02, 0x12,
- 0x0a, 0x0a, 0x06, 0x43, 0x4f, 0x4d, 0x4d, 0x49, 0x54, 0x10, 0x03, 0x12, 0x0c, 0x0a, 0x08, 0x52,
- 0x4f, 0x4c, 0x4c, 0x42, 0x41, 0x43, 0x4b, 0x10, 0x04, 0x12, 0x07, 0x0a, 0x03, 0x44, 0x44, 0x4c,
- 0x10, 0x05, 0x12, 0x0a, 0x0a, 0x06, 0x49, 0x4e, 0x53, 0x45, 0x52, 0x54, 0x10, 0x06, 0x12, 0x0b,
- 0x0a, 0x07, 0x52, 0x45, 0x50, 0x4c, 0x41, 0x43, 0x45, 0x10, 0x07, 0x12, 0x0a, 0x0a, 0x06, 0x55,
- 0x50, 0x44, 0x41, 0x54, 0x45, 0x10, 0x08, 0x12, 0x0a, 0x0a, 0x06, 0x44, 0x45, 0x4c, 0x45, 0x54,
- 0x45, 0x10, 0x09, 0x12, 0x07, 0x0a, 0x03, 0x53, 0x45, 0x54, 0x10, 0x0a, 0x12, 0x09, 0x0a, 0x05,
- 0x4f, 0x54, 0x48, 0x45, 0x52, 0x10, 0x0b, 0x12, 0x07, 0x0a, 0x03, 0x52, 0x4f, 0x57, 0x10, 0x0c,
- 0x12, 0x09, 0x0a, 0x05, 0x46, 0x49, 0x45, 0x4c, 0x44, 0x10, 0x0d, 0x12, 0x0d, 0x0a, 0x09, 0x48,
- 0x45, 0x41, 0x52, 0x54, 0x42, 0x45, 0x41, 0x54, 0x10, 0x0e, 0x12, 0x09, 0x0a, 0x05, 0x56, 0x47,
- 0x54, 0x49, 0x44, 0x10, 0x0f, 0x12, 0x0b, 0x0a, 0x07, 0x4a, 0x4f, 0x55, 0x52, 0x4e, 0x41, 0x4c,
- 0x10, 0x10, 0x12, 0x0b, 0x0a, 0x07, 0x56, 0x45, 0x52, 0x53, 0x49, 0x4f, 0x4e, 0x10, 0x11, 0x12,
- 0x0a, 0x0a, 0x06, 0x4c, 0x41, 0x53, 0x54, 0x50, 0x4b, 0x10, 0x12, 0x12, 0x0d, 0x0a, 0x09, 0x53,
- 0x41, 0x56, 0x45, 0x50, 0x4f, 0x49, 0x4e, 0x54, 0x10, 0x13, 0x12, 0x12, 0x0a, 0x0e, 0x43, 0x4f,
- 0x50, 0x59, 0x5f, 0x43, 0x4f, 0x4d, 0x50, 0x4c, 0x45, 0x54, 0x45, 0x44, 0x10, 0x14, 0x2a, 0x27,
- 0x0a, 0x0d, 0x4d, 0x69, 0x67, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x12,
- 0x0a, 0x0a, 0x06, 0x54, 0x41, 0x42, 0x4c, 0x45, 0x53, 0x10, 0x00, 0x12, 0x0a, 0x0a, 0x06, 0x53,
- 0x48, 0x41, 0x52, 0x44, 0x53, 0x10, 0x01, 0x42, 0x29, 0x5a, 0x27, 0x76, 0x69, 0x74, 0x65, 0x73,
- 0x73, 0x2e, 0x69, 0x6f, 0x2f, 0x76, 0x69, 0x74, 0x65, 0x73, 0x73, 0x2f, 0x67, 0x6f, 0x2f, 0x76,
- 0x74, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x62, 0x69, 0x6e, 0x6c, 0x6f, 0x67, 0x64, 0x61,
- 0x74, 0x61, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+ 0x52, 0x04, 0x72, 0x6f, 0x77, 0x73, 0x2a, 0x3e, 0x0a, 0x0b, 0x4f, 0x6e, 0x44, 0x44, 0x4c, 0x41,
+ 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x0a, 0x0a, 0x06, 0x49, 0x47, 0x4e, 0x4f, 0x52, 0x45, 0x10,
+ 0x00, 0x12, 0x08, 0x0a, 0x04, 0x53, 0x54, 0x4f, 0x50, 0x10, 0x01, 0x12, 0x08, 0x0a, 0x04, 0x45,
+ 0x58, 0x45, 0x43, 0x10, 0x02, 0x12, 0x0f, 0x0a, 0x0b, 0x45, 0x58, 0x45, 0x43, 0x5f, 0x49, 0x47,
+ 0x4e, 0x4f, 0x52, 0x45, 0x10, 0x03, 0x2a, 0x7b, 0x0a, 0x18, 0x56, 0x52, 0x65, 0x70, 0x6c, 0x69,
+ 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x57, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x54, 0x79,
+ 0x70, 0x65, 0x12, 0x0f, 0x0a, 0x0b, 0x4d, 0x61, 0x74, 0x65, 0x72, 0x69, 0x61, 0x6c, 0x69, 0x7a,
+ 0x65, 0x10, 0x00, 0x12, 0x0e, 0x0a, 0x0a, 0x4d, 0x6f, 0x76, 0x65, 0x54, 0x61, 0x62, 0x6c, 0x65,
+ 0x73, 0x10, 0x01, 0x12, 0x15, 0x0a, 0x11, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4c, 0x6f, 0x6f,
+ 0x6b, 0x75, 0x70, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x10, 0x02, 0x12, 0x0b, 0x0a, 0x07, 0x4d, 0x69,
+ 0x67, 0x72, 0x61, 0x74, 0x65, 0x10, 0x03, 0x12, 0x0b, 0x0a, 0x07, 0x52, 0x65, 0x73, 0x68, 0x61,
+ 0x72, 0x64, 0x10, 0x04, 0x12, 0x0d, 0x0a, 0x09, 0x4f, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x44, 0x44,
+ 0x4c, 0x10, 0x05, 0x2a, 0x44, 0x0a, 0x1b, 0x56, 0x52, 0x65, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74,
+ 0x69, 0x6f, 0x6e, 0x57, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x53, 0x75, 0x62, 0x54, 0x79,
+ 0x70, 0x65, 0x12, 0x08, 0x0a, 0x04, 0x4e, 0x6f, 0x6e, 0x65, 0x10, 0x00, 0x12, 0x0b, 0x0a, 0x07,
+ 0x50, 0x61, 0x72, 0x74, 0x69, 0x61, 0x6c, 0x10, 0x01, 0x12, 0x0e, 0x0a, 0x0a, 0x41, 0x74, 0x6f,
+ 0x6d, 0x69, 0x63, 0x43, 0x6f, 0x70, 0x79, 0x10, 0x02, 0x2a, 0x71, 0x0a, 0x19, 0x56, 0x52, 0x65,
+ 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x57, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f,
+ 0x77, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x0b, 0x0a, 0x07, 0x55, 0x6e, 0x6b, 0x6e, 0x6f, 0x77,
+ 0x6e, 0x10, 0x00, 0x12, 0x08, 0x0a, 0x04, 0x49, 0x6e, 0x69, 0x74, 0x10, 0x01, 0x12, 0x0b, 0x0a,
+ 0x07, 0x53, 0x74, 0x6f, 0x70, 0x70, 0x65, 0x64, 0x10, 0x02, 0x12, 0x0b, 0x0a, 0x07, 0x43, 0x6f,
+ 0x70, 0x79, 0x69, 0x6e, 0x67, 0x10, 0x03, 0x12, 0x0b, 0x0a, 0x07, 0x52, 0x75, 0x6e, 0x6e, 0x69,
+ 0x6e, 0x67, 0x10, 0x04, 0x12, 0x09, 0x0a, 0x05, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x10, 0x05, 0x12,
+ 0x0b, 0x0a, 0x07, 0x4c, 0x61, 0x67, 0x67, 0x69, 0x6e, 0x67, 0x10, 0x06, 0x2a, 0x8d, 0x02, 0x0a,
+ 0x0a, 0x56, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x54, 0x79, 0x70, 0x65, 0x12, 0x0b, 0x0a, 0x07, 0x55,
+ 0x4e, 0x4b, 0x4e, 0x4f, 0x57, 0x4e, 0x10, 0x00, 0x12, 0x08, 0x0a, 0x04, 0x47, 0x54, 0x49, 0x44,
+ 0x10, 0x01, 0x12, 0x09, 0x0a, 0x05, 0x42, 0x45, 0x47, 0x49, 0x4e, 0x10, 0x02, 0x12, 0x0a, 0x0a,
+ 0x06, 0x43, 0x4f, 0x4d, 0x4d, 0x49, 0x54, 0x10, 0x03, 0x12, 0x0c, 0x0a, 0x08, 0x52, 0x4f, 0x4c,
+ 0x4c, 0x42, 0x41, 0x43, 0x4b, 0x10, 0x04, 0x12, 0x07, 0x0a, 0x03, 0x44, 0x44, 0x4c, 0x10, 0x05,
+ 0x12, 0x0a, 0x0a, 0x06, 0x49, 0x4e, 0x53, 0x45, 0x52, 0x54, 0x10, 0x06, 0x12, 0x0b, 0x0a, 0x07,
+ 0x52, 0x45, 0x50, 0x4c, 0x41, 0x43, 0x45, 0x10, 0x07, 0x12, 0x0a, 0x0a, 0x06, 0x55, 0x50, 0x44,
+ 0x41, 0x54, 0x45, 0x10, 0x08, 0x12, 0x0a, 0x0a, 0x06, 0x44, 0x45, 0x4c, 0x45, 0x54, 0x45, 0x10,
+ 0x09, 0x12, 0x07, 0x0a, 0x03, 0x53, 0x45, 0x54, 0x10, 0x0a, 0x12, 0x09, 0x0a, 0x05, 0x4f, 0x54,
+ 0x48, 0x45, 0x52, 0x10, 0x0b, 0x12, 0x07, 0x0a, 0x03, 0x52, 0x4f, 0x57, 0x10, 0x0c, 0x12, 0x09,
+ 0x0a, 0x05, 0x46, 0x49, 0x45, 0x4c, 0x44, 0x10, 0x0d, 0x12, 0x0d, 0x0a, 0x09, 0x48, 0x45, 0x41,
+ 0x52, 0x54, 0x42, 0x45, 0x41, 0x54, 0x10, 0x0e, 0x12, 0x09, 0x0a, 0x05, 0x56, 0x47, 0x54, 0x49,
+ 0x44, 0x10, 0x0f, 0x12, 0x0b, 0x0a, 0x07, 0x4a, 0x4f, 0x55, 0x52, 0x4e, 0x41, 0x4c, 0x10, 0x10,
+ 0x12, 0x0b, 0x0a, 0x07, 0x56, 0x45, 0x52, 0x53, 0x49, 0x4f, 0x4e, 0x10, 0x11, 0x12, 0x0a, 0x0a,
+ 0x06, 0x4c, 0x41, 0x53, 0x54, 0x50, 0x4b, 0x10, 0x12, 0x12, 0x0d, 0x0a, 0x09, 0x53, 0x41, 0x56,
+ 0x45, 0x50, 0x4f, 0x49, 0x4e, 0x54, 0x10, 0x13, 0x12, 0x12, 0x0a, 0x0e, 0x43, 0x4f, 0x50, 0x59,
+ 0x5f, 0x43, 0x4f, 0x4d, 0x50, 0x4c, 0x45, 0x54, 0x45, 0x44, 0x10, 0x14, 0x2a, 0x27, 0x0a, 0x0d,
+ 0x4d, 0x69, 0x67, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x12, 0x0a, 0x0a,
+ 0x06, 0x54, 0x41, 0x42, 0x4c, 0x45, 0x53, 0x10, 0x00, 0x12, 0x0a, 0x0a, 0x06, 0x53, 0x48, 0x41,
+ 0x52, 0x44, 0x53, 0x10, 0x01, 0x42, 0x29, 0x5a, 0x27, 0x76, 0x69, 0x74, 0x65, 0x73, 0x73, 0x2e,
+ 0x69, 0x6f, 0x2f, 0x76, 0x69, 0x74, 0x65, 0x73, 0x73, 0x2f, 0x67, 0x6f, 0x2f, 0x76, 0x74, 0x2f,
+ 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x62, 0x69, 0x6e, 0x6c, 0x6f, 0x67, 0x64, 0x61, 0x74, 0x61,
+ 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
}
var (
@@ -3631,61 +3652,62 @@ var file_binlogdata_proto_depIdxs = []int32{
48, // 16: binlogdata.RowChange.before:type_name -> query.Row
48, // 17: binlogdata.RowChange.after:type_name -> query.Row
43, // 18: binlogdata.RowChange.data_columns:type_name -> binlogdata.RowChange.Bitmap
- 18, // 19: binlogdata.RowEvent.row_changes:type_name -> binlogdata.RowChange
- 49, // 20: binlogdata.FieldEvent.fields:type_name -> query.Field
- 36, // 21: binlogdata.ShardGtid.table_p_ks:type_name -> binlogdata.TableLastPK
- 21, // 22: binlogdata.VGtid.shard_gtids:type_name -> binlogdata.ShardGtid
- 5, // 23: binlogdata.Journal.migration_type:type_name -> binlogdata.MigrationType
- 21, // 24: binlogdata.Journal.shard_gtids:type_name -> binlogdata.ShardGtid
- 23, // 25: binlogdata.Journal.participants:type_name -> binlogdata.KeyspaceShard
- 4, // 26: binlogdata.VEvent.type:type_name -> binlogdata.VEventType
- 19, // 27: binlogdata.VEvent.row_event:type_name -> binlogdata.RowEvent
- 20, // 28: binlogdata.VEvent.field_event:type_name -> binlogdata.FieldEvent
- 22, // 29: binlogdata.VEvent.vgtid:type_name -> binlogdata.VGtid
- 24, // 30: binlogdata.VEvent.journal:type_name -> binlogdata.Journal
- 35, // 31: binlogdata.VEvent.last_p_k_event:type_name -> binlogdata.LastPKEvent
- 49, // 32: binlogdata.MinimalTable.fields:type_name -> query.Field
- 26, // 33: binlogdata.MinimalSchema.tables:type_name -> binlogdata.MinimalTable
- 44, // 34: binlogdata.VStreamOptions.config_overrides:type_name -> binlogdata.VStreamOptions.ConfigOverridesEntry
- 50, // 35: binlogdata.VStreamRequest.effective_caller_id:type_name -> vtrpc.CallerID
- 51, // 36: binlogdata.VStreamRequest.immediate_caller_id:type_name -> query.VTGateCallerID
- 52, // 37: binlogdata.VStreamRequest.target:type_name -> query.Target
- 16, // 38: binlogdata.VStreamRequest.filter:type_name -> binlogdata.Filter
- 36, // 39: binlogdata.VStreamRequest.table_last_p_ks:type_name -> binlogdata.TableLastPK
- 28, // 40: binlogdata.VStreamRequest.options:type_name -> binlogdata.VStreamOptions
- 25, // 41: binlogdata.VStreamResponse.events:type_name -> binlogdata.VEvent
- 50, // 42: binlogdata.VStreamRowsRequest.effective_caller_id:type_name -> vtrpc.CallerID
- 51, // 43: binlogdata.VStreamRowsRequest.immediate_caller_id:type_name -> query.VTGateCallerID
- 52, // 44: binlogdata.VStreamRowsRequest.target:type_name -> query.Target
- 53, // 45: binlogdata.VStreamRowsRequest.lastpk:type_name -> query.QueryResult
- 28, // 46: binlogdata.VStreamRowsRequest.options:type_name -> binlogdata.VStreamOptions
- 49, // 47: binlogdata.VStreamRowsResponse.fields:type_name -> query.Field
- 49, // 48: binlogdata.VStreamRowsResponse.pkfields:type_name -> query.Field
- 48, // 49: binlogdata.VStreamRowsResponse.rows:type_name -> query.Row
- 48, // 50: binlogdata.VStreamRowsResponse.lastpk:type_name -> query.Row
- 50, // 51: binlogdata.VStreamTablesRequest.effective_caller_id:type_name -> vtrpc.CallerID
- 51, // 52: binlogdata.VStreamTablesRequest.immediate_caller_id:type_name -> query.VTGateCallerID
- 52, // 53: binlogdata.VStreamTablesRequest.target:type_name -> query.Target
- 28, // 54: binlogdata.VStreamTablesRequest.options:type_name -> binlogdata.VStreamOptions
- 49, // 55: binlogdata.VStreamTablesResponse.fields:type_name -> query.Field
- 49, // 56: binlogdata.VStreamTablesResponse.pkfields:type_name -> query.Field
- 48, // 57: binlogdata.VStreamTablesResponse.rows:type_name -> query.Row
- 48, // 58: binlogdata.VStreamTablesResponse.lastpk:type_name -> query.Row
- 36, // 59: binlogdata.LastPKEvent.table_last_p_k:type_name -> binlogdata.TableLastPK
- 53, // 60: binlogdata.TableLastPK.lastpk:type_name -> query.QueryResult
- 50, // 61: binlogdata.VStreamResultsRequest.effective_caller_id:type_name -> vtrpc.CallerID
- 51, // 62: binlogdata.VStreamResultsRequest.immediate_caller_id:type_name -> query.VTGateCallerID
- 52, // 63: binlogdata.VStreamResultsRequest.target:type_name -> query.Target
- 49, // 64: binlogdata.VStreamResultsResponse.fields:type_name -> query.Field
- 48, // 65: binlogdata.VStreamResultsResponse.rows:type_name -> query.Row
- 6, // 66: binlogdata.BinlogTransaction.Statement.category:type_name -> binlogdata.BinlogTransaction.Statement.Category
- 8, // 67: binlogdata.BinlogTransaction.Statement.charset:type_name -> binlogdata.Charset
- 14, // 68: binlogdata.Rule.ConvertCharsetEntry.value:type_name -> binlogdata.CharsetConversion
- 69, // [69:69] is the sub-list for method output_type
- 69, // [69:69] is the sub-list for method input_type
- 69, // [69:69] is the sub-list for extension type_name
- 69, // [69:69] is the sub-list for extension extendee
- 0, // [0:69] is the sub-list for field type_name
+ 43, // 19: binlogdata.RowChange.json_partial_values:type_name -> binlogdata.RowChange.Bitmap
+ 18, // 20: binlogdata.RowEvent.row_changes:type_name -> binlogdata.RowChange
+ 49, // 21: binlogdata.FieldEvent.fields:type_name -> query.Field
+ 36, // 22: binlogdata.ShardGtid.table_p_ks:type_name -> binlogdata.TableLastPK
+ 21, // 23: binlogdata.VGtid.shard_gtids:type_name -> binlogdata.ShardGtid
+ 5, // 24: binlogdata.Journal.migration_type:type_name -> binlogdata.MigrationType
+ 21, // 25: binlogdata.Journal.shard_gtids:type_name -> binlogdata.ShardGtid
+ 23, // 26: binlogdata.Journal.participants:type_name -> binlogdata.KeyspaceShard
+ 4, // 27: binlogdata.VEvent.type:type_name -> binlogdata.VEventType
+ 19, // 28: binlogdata.VEvent.row_event:type_name -> binlogdata.RowEvent
+ 20, // 29: binlogdata.VEvent.field_event:type_name -> binlogdata.FieldEvent
+ 22, // 30: binlogdata.VEvent.vgtid:type_name -> binlogdata.VGtid
+ 24, // 31: binlogdata.VEvent.journal:type_name -> binlogdata.Journal
+ 35, // 32: binlogdata.VEvent.last_p_k_event:type_name -> binlogdata.LastPKEvent
+ 49, // 33: binlogdata.MinimalTable.fields:type_name -> query.Field
+ 26, // 34: binlogdata.MinimalSchema.tables:type_name -> binlogdata.MinimalTable
+ 44, // 35: binlogdata.VStreamOptions.config_overrides:type_name -> binlogdata.VStreamOptions.ConfigOverridesEntry
+ 50, // 36: binlogdata.VStreamRequest.effective_caller_id:type_name -> vtrpc.CallerID
+ 51, // 37: binlogdata.VStreamRequest.immediate_caller_id:type_name -> query.VTGateCallerID
+ 52, // 38: binlogdata.VStreamRequest.target:type_name -> query.Target
+ 16, // 39: binlogdata.VStreamRequest.filter:type_name -> binlogdata.Filter
+ 36, // 40: binlogdata.VStreamRequest.table_last_p_ks:type_name -> binlogdata.TableLastPK
+ 28, // 41: binlogdata.VStreamRequest.options:type_name -> binlogdata.VStreamOptions
+ 25, // 42: binlogdata.VStreamResponse.events:type_name -> binlogdata.VEvent
+ 50, // 43: binlogdata.VStreamRowsRequest.effective_caller_id:type_name -> vtrpc.CallerID
+ 51, // 44: binlogdata.VStreamRowsRequest.immediate_caller_id:type_name -> query.VTGateCallerID
+ 52, // 45: binlogdata.VStreamRowsRequest.target:type_name -> query.Target
+ 53, // 46: binlogdata.VStreamRowsRequest.lastpk:type_name -> query.QueryResult
+ 28, // 47: binlogdata.VStreamRowsRequest.options:type_name -> binlogdata.VStreamOptions
+ 49, // 48: binlogdata.VStreamRowsResponse.fields:type_name -> query.Field
+ 49, // 49: binlogdata.VStreamRowsResponse.pkfields:type_name -> query.Field
+ 48, // 50: binlogdata.VStreamRowsResponse.rows:type_name -> query.Row
+ 48, // 51: binlogdata.VStreamRowsResponse.lastpk:type_name -> query.Row
+ 50, // 52: binlogdata.VStreamTablesRequest.effective_caller_id:type_name -> vtrpc.CallerID
+ 51, // 53: binlogdata.VStreamTablesRequest.immediate_caller_id:type_name -> query.VTGateCallerID
+ 52, // 54: binlogdata.VStreamTablesRequest.target:type_name -> query.Target
+ 28, // 55: binlogdata.VStreamTablesRequest.options:type_name -> binlogdata.VStreamOptions
+ 49, // 56: binlogdata.VStreamTablesResponse.fields:type_name -> query.Field
+ 49, // 57: binlogdata.VStreamTablesResponse.pkfields:type_name -> query.Field
+ 48, // 58: binlogdata.VStreamTablesResponse.rows:type_name -> query.Row
+ 48, // 59: binlogdata.VStreamTablesResponse.lastpk:type_name -> query.Row
+ 36, // 60: binlogdata.LastPKEvent.table_last_p_k:type_name -> binlogdata.TableLastPK
+ 53, // 61: binlogdata.TableLastPK.lastpk:type_name -> query.QueryResult
+ 50, // 62: binlogdata.VStreamResultsRequest.effective_caller_id:type_name -> vtrpc.CallerID
+ 51, // 63: binlogdata.VStreamResultsRequest.immediate_caller_id:type_name -> query.VTGateCallerID
+ 52, // 64: binlogdata.VStreamResultsRequest.target:type_name -> query.Target
+ 49, // 65: binlogdata.VStreamResultsResponse.fields:type_name -> query.Field
+ 48, // 66: binlogdata.VStreamResultsResponse.rows:type_name -> query.Row
+ 6, // 67: binlogdata.BinlogTransaction.Statement.category:type_name -> binlogdata.BinlogTransaction.Statement.Category
+ 8, // 68: binlogdata.BinlogTransaction.Statement.charset:type_name -> binlogdata.Charset
+ 14, // 69: binlogdata.Rule.ConvertCharsetEntry.value:type_name -> binlogdata.CharsetConversion
+ 70, // [70:70] is the sub-list for method output_type
+ 70, // [70:70] is the sub-list for method input_type
+ 70, // [70:70] is the sub-list for extension type_name
+ 70, // [70:70] is the sub-list for extension extendee
+ 0, // [0:70] is the sub-list for field type_name
}
func init() { file_binlogdata_proto_init() }
diff --git a/go/vt/proto/binlogdata/binlogdata_vtproto.pb.go b/go/vt/proto/binlogdata/binlogdata_vtproto.pb.go
index 98fba617973..93b378738dd 100644
--- a/go/vt/proto/binlogdata/binlogdata_vtproto.pb.go
+++ b/go/vt/proto/binlogdata/binlogdata_vtproto.pb.go
@@ -314,6 +314,7 @@ func (m *RowChange) CloneVT() *RowChange {
r.Before = m.Before.CloneVT()
r.After = m.After.CloneVT()
r.DataColumns = m.DataColumns.CloneVT()
+ r.JsonPartialValues = m.JsonPartialValues.CloneVT()
if len(m.unknownFields) > 0 {
r.unknownFields = make([]byte, len(m.unknownFields))
copy(r.unknownFields, m.unknownFields)
@@ -1675,6 +1676,16 @@ func (m *RowChange) MarshalToSizedBufferVT(dAtA []byte) (int, error) {
i -= len(m.unknownFields)
copy(dAtA[i:], m.unknownFields)
}
+ if m.JsonPartialValues != nil {
+ size, err := m.JsonPartialValues.MarshalToSizedBufferVT(dAtA[:i])
+ if err != nil {
+ return 0, err
+ }
+ i -= size
+ i = protohelpers.EncodeVarint(dAtA, i, uint64(size))
+ i--
+ dAtA[i] = 0x22
+ }
if m.DataColumns != nil {
size, err := m.DataColumns.MarshalToSizedBufferVT(dAtA[:i])
if err != nil {
@@ -3636,6 +3647,10 @@ func (m *RowChange) SizeVT() (n int) {
l = m.DataColumns.SizeVT()
n += 1 + l + protohelpers.SizeOfVarint(uint64(l))
}
+ if m.JsonPartialValues != nil {
+ l = m.JsonPartialValues.SizeVT()
+ n += 1 + l + protohelpers.SizeOfVarint(uint64(l))
+ }
n += len(m.unknownFields)
return n
}
@@ -6619,6 +6634,42 @@ func (m *RowChange) UnmarshalVT(dAtA []byte) error {
return err
}
iNdEx = postIndex
+ case 4:
+ if wireType != 2 {
+ return fmt.Errorf("proto: wrong wireType = %d for field JsonPartialValues", wireType)
+ }
+ var msglen int
+ for shift := uint(0); ; shift += 7 {
+ if shift >= 64 {
+ return protohelpers.ErrIntOverflow
+ }
+ if iNdEx >= l {
+ return io.ErrUnexpectedEOF
+ }
+ b := dAtA[iNdEx]
+ iNdEx++
+ msglen |= int(b&0x7F) << shift
+ if b < 0x80 {
+ break
+ }
+ }
+ if msglen < 0 {
+ return protohelpers.ErrInvalidLength
+ }
+ postIndex := iNdEx + msglen
+ if postIndex < 0 {
+ return protohelpers.ErrInvalidLength
+ }
+ if postIndex > l {
+ return io.ErrUnexpectedEOF
+ }
+ if m.JsonPartialValues == nil {
+ m.JsonPartialValues = &RowChange_Bitmap{}
+ }
+ if err := m.JsonPartialValues.UnmarshalVT(dAtA[iNdEx:postIndex]); err != nil {
+ return err
+ }
+ iNdEx = postIndex
default:
iNdEx = preIndex
skippy, err := protohelpers.Skip(dAtA[iNdEx:])
diff --git a/go/vt/proto/query/query.pb.go b/go/vt/proto/query/query.pb.go
index 8c4bcb93f47..a03e5fa9025 100644
--- a/go/vt/proto/query/query.pb.go
+++ b/go/vt/proto/query/query.pb.go
@@ -1397,6 +1397,11 @@ type ExecuteOptions struct {
//
// *ExecuteOptions_AuthoritativeTimeout
Timeout isExecuteOptions_Timeout `protobuf_oneof:"timeout"`
+ // fetch_last_insert_id indicates that after executing a DML involving last_insert_id(x),
+ // a subsequent "SELECT last_insert_id()" should be performed to retrieve the updated value.
+ // This is to circumvent a bug where setting last_insert_id(x) to zero is not signaled by mysql
+ // https://bugs.mysql.com/bug.php?id=116939
+ FetchLastInsertId bool `protobuf:"varint,18,opt,name=fetch_last_insert_id,json=fetchLastInsertId,proto3" json:"fetch_last_insert_id,omitempty"`
}
func (x *ExecuteOptions) Reset() {
@@ -1527,6 +1532,13 @@ func (x *ExecuteOptions) GetAuthoritativeTimeout() int64 {
return 0
}
+func (x *ExecuteOptions) GetFetchLastInsertId() bool {
+ if x != nil {
+ return x.FetchLastInsertId
+ }
+ return false
+}
+
type isExecuteOptions_Timeout interface {
isExecuteOptions_Timeout()
}
@@ -1752,6 +1764,7 @@ type QueryResult struct {
Rows []*Row `protobuf:"bytes,4,rep,name=rows,proto3" json:"rows,omitempty"`
Info string `protobuf:"bytes,6,opt,name=info,proto3" json:"info,omitempty"`
SessionStateChanges string `protobuf:"bytes,7,opt,name=session_state_changes,json=sessionStateChanges,proto3" json:"session_state_changes,omitempty"`
+ InsertIdChanged bool `protobuf:"varint,8,opt,name=insert_id_changed,json=insertIdChanged,proto3" json:"insert_id_changed,omitempty"`
}
func (x *QueryResult) Reset() {
@@ -1826,6 +1839,13 @@ func (x *QueryResult) GetSessionStateChanges() string {
return ""
}
+func (x *QueryResult) GetInsertIdChanged() bool {
+ if x != nil {
+ return x.InsertIdChanged
+ }
+ return false
+}
+
// QueryWarning is used to convey out of band query execution warnings
// by storing in the vtgate.Session
type QueryWarning struct {
@@ -5855,7 +5875,7 @@ var file_query_proto_rawDesc = []byte{
0x12, 0x29, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32,
0x13, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x42, 0x69, 0x6e, 0x64, 0x56, 0x61, 0x72, 0x69,
0x61, 0x62, 0x6c, 0x65, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22,
- 0xda, 0x0b, 0x0a, 0x0e, 0x45, 0x78, 0x65, 0x63, 0x75, 0x74, 0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f,
+ 0x8b, 0x0c, 0x0a, 0x0e, 0x45, 0x78, 0x65, 0x63, 0x75, 0x74, 0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f,
0x6e, 0x73, 0x12, 0x4d, 0x0a, 0x0f, 0x69, 0x6e, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x64, 0x5f, 0x66,
0x69, 0x65, 0x6c, 0x64, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x24, 0x2e, 0x71, 0x75,
0x65, 0x72, 0x79, 0x2e, 0x45, 0x78, 0x65, 0x63, 0x75, 0x74, 0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f,
@@ -5906,220 +5926,208 @@ var file_query_proto_rawDesc = []byte{
0x74, 0x68, 0x6f, 0x72, 0x69, 0x74, 0x61, 0x74, 0x69, 0x76, 0x65, 0x5f, 0x74, 0x69, 0x6d, 0x65,
0x6f, 0x75, 0x74, 0x18, 0x11, 0x20, 0x01, 0x28, 0x03, 0x48, 0x00, 0x52, 0x14, 0x61, 0x75, 0x74,
0x68, 0x6f, 0x72, 0x69, 0x74, 0x61, 0x74, 0x69, 0x76, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75,
- 0x74, 0x22, 0x3b, 0x0a, 0x0e, 0x49, 0x6e, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x64, 0x46, 0x69, 0x65,
- 0x6c, 0x64, 0x73, 0x12, 0x11, 0x0a, 0x0d, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x41, 0x4e, 0x44, 0x5f,
- 0x4e, 0x41, 0x4d, 0x45, 0x10, 0x00, 0x12, 0x0d, 0x0a, 0x09, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x4f,
- 0x4e, 0x4c, 0x59, 0x10, 0x01, 0x12, 0x07, 0x0a, 0x03, 0x41, 0x4c, 0x4c, 0x10, 0x02, 0x22, 0x38,
- 0x0a, 0x08, 0x57, 0x6f, 0x72, 0x6b, 0x6c, 0x6f, 0x61, 0x64, 0x12, 0x0f, 0x0a, 0x0b, 0x55, 0x4e,
- 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x08, 0x0a, 0x04, 0x4f,
- 0x4c, 0x54, 0x50, 0x10, 0x01, 0x12, 0x08, 0x0a, 0x04, 0x4f, 0x4c, 0x41, 0x50, 0x10, 0x02, 0x12,
- 0x07, 0x0a, 0x03, 0x44, 0x42, 0x41, 0x10, 0x03, 0x22, 0xa7, 0x01, 0x0a, 0x14, 0x54, 0x72, 0x61,
- 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x73, 0x6f, 0x6c, 0x61, 0x74, 0x69, 0x6f,
- 0x6e, 0x12, 0x0b, 0x0a, 0x07, 0x44, 0x45, 0x46, 0x41, 0x55, 0x4c, 0x54, 0x10, 0x00, 0x12, 0x13,
- 0x0a, 0x0f, 0x52, 0x45, 0x50, 0x45, 0x41, 0x54, 0x41, 0x42, 0x4c, 0x45, 0x5f, 0x52, 0x45, 0x41,
- 0x44, 0x10, 0x01, 0x12, 0x12, 0x0a, 0x0e, 0x52, 0x45, 0x41, 0x44, 0x5f, 0x43, 0x4f, 0x4d, 0x4d,
- 0x49, 0x54, 0x54, 0x45, 0x44, 0x10, 0x02, 0x12, 0x14, 0x0a, 0x10, 0x52, 0x45, 0x41, 0x44, 0x5f,
- 0x55, 0x4e, 0x43, 0x4f, 0x4d, 0x4d, 0x49, 0x54, 0x54, 0x45, 0x44, 0x10, 0x03, 0x12, 0x10, 0x0a,
- 0x0c, 0x53, 0x45, 0x52, 0x49, 0x41, 0x4c, 0x49, 0x5a, 0x41, 0x42, 0x4c, 0x45, 0x10, 0x04, 0x12,
- 0x21, 0x0a, 0x1d, 0x43, 0x4f, 0x4e, 0x53, 0x49, 0x53, 0x54, 0x45, 0x4e, 0x54, 0x5f, 0x53, 0x4e,
- 0x41, 0x50, 0x53, 0x48, 0x4f, 0x54, 0x5f, 0x52, 0x45, 0x41, 0x44, 0x5f, 0x4f, 0x4e, 0x4c, 0x59,
- 0x10, 0x05, 0x12, 0x0e, 0x0a, 0x0a, 0x41, 0x55, 0x54, 0x4f, 0x43, 0x4f, 0x4d, 0x4d, 0x49, 0x54,
- 0x10, 0x06, 0x22, 0x92, 0x01, 0x0a, 0x0e, 0x50, 0x6c, 0x61, 0x6e, 0x6e, 0x65, 0x72, 0x56, 0x65,
- 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x13, 0x0a, 0x0f, 0x44, 0x45, 0x46, 0x41, 0x55, 0x4c, 0x54,
- 0x5f, 0x50, 0x4c, 0x41, 0x4e, 0x4e, 0x45, 0x52, 0x10, 0x00, 0x12, 0x06, 0x0a, 0x02, 0x56, 0x33,
- 0x10, 0x01, 0x12, 0x08, 0x0a, 0x04, 0x47, 0x65, 0x6e, 0x34, 0x10, 0x02, 0x12, 0x0e, 0x0a, 0x0a,
- 0x47, 0x65, 0x6e, 0x34, 0x47, 0x72, 0x65, 0x65, 0x64, 0x79, 0x10, 0x03, 0x12, 0x12, 0x0a, 0x0e,
- 0x47, 0x65, 0x6e, 0x34, 0x4c, 0x65, 0x66, 0x74, 0x32, 0x52, 0x69, 0x67, 0x68, 0x74, 0x10, 0x04,
- 0x12, 0x14, 0x0a, 0x10, 0x47, 0x65, 0x6e, 0x34, 0x57, 0x69, 0x74, 0x68, 0x46, 0x61, 0x6c, 0x6c,
- 0x62, 0x61, 0x63, 0x6b, 0x10, 0x05, 0x12, 0x11, 0x0a, 0x0d, 0x47, 0x65, 0x6e, 0x34, 0x43, 0x6f,
- 0x6d, 0x70, 0x61, 0x72, 0x65, 0x56, 0x33, 0x10, 0x06, 0x12, 0x0c, 0x0a, 0x08, 0x56, 0x33, 0x49,
- 0x6e, 0x73, 0x65, 0x72, 0x74, 0x10, 0x07, 0x22, 0x84, 0x01, 0x0a, 0x0c, 0x43, 0x6f, 0x6e, 0x73,
- 0x6f, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x12, 0x1c, 0x0a, 0x18, 0x43, 0x4f, 0x4e, 0x53,
- 0x4f, 0x4c, 0x49, 0x44, 0x41, 0x54, 0x4f, 0x52, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49,
- 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x19, 0x0a, 0x15, 0x43, 0x4f, 0x4e, 0x53, 0x4f, 0x4c,
- 0x49, 0x44, 0x41, 0x54, 0x4f, 0x52, 0x5f, 0x44, 0x49, 0x53, 0x41, 0x42, 0x4c, 0x45, 0x44, 0x10,
- 0x01, 0x12, 0x18, 0x0a, 0x14, 0x43, 0x4f, 0x4e, 0x53, 0x4f, 0x4c, 0x49, 0x44, 0x41, 0x54, 0x4f,
- 0x52, 0x5f, 0x45, 0x4e, 0x41, 0x42, 0x4c, 0x45, 0x44, 0x10, 0x02, 0x12, 0x21, 0x0a, 0x1d, 0x43,
- 0x4f, 0x4e, 0x53, 0x4f, 0x4c, 0x49, 0x44, 0x41, 0x54, 0x4f, 0x52, 0x5f, 0x45, 0x4e, 0x41, 0x42,
- 0x4c, 0x45, 0x44, 0x5f, 0x52, 0x45, 0x50, 0x4c, 0x49, 0x43, 0x41, 0x53, 0x10, 0x03, 0x22, 0x4f,
- 0x0a, 0x15, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x41, 0x63, 0x63,
- 0x65, 0x73, 0x73, 0x4d, 0x6f, 0x64, 0x65, 0x12, 0x17, 0x0a, 0x13, 0x43, 0x4f, 0x4e, 0x53, 0x49,
- 0x53, 0x54, 0x45, 0x4e, 0x54, 0x5f, 0x53, 0x4e, 0x41, 0x50, 0x53, 0x48, 0x4f, 0x54, 0x10, 0x00,
- 0x12, 0x0e, 0x0a, 0x0a, 0x52, 0x45, 0x41, 0x44, 0x5f, 0x57, 0x52, 0x49, 0x54, 0x45, 0x10, 0x01,
- 0x12, 0x0d, 0x0a, 0x09, 0x52, 0x45, 0x41, 0x44, 0x5f, 0x4f, 0x4e, 0x4c, 0x59, 0x10, 0x02, 0x42,
- 0x09, 0x0a, 0x07, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x4a, 0x04, 0x08, 0x01, 0x10, 0x02,
- 0x4a, 0x04, 0x08, 0x02, 0x10, 0x03, 0x4a, 0x04, 0x08, 0x03, 0x10, 0x04, 0x22, 0xb8, 0x02, 0x0a,
- 0x05, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01,
- 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x1f, 0x0a, 0x04, 0x74, 0x79,
- 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0b, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79,
- 0x2e, 0x54, 0x79, 0x70, 0x65, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x74,
- 0x61, 0x62, 0x6c, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x74, 0x61, 0x62, 0x6c,
- 0x65, 0x12, 0x1b, 0x0a, 0x09, 0x6f, 0x72, 0x67, 0x5f, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x18, 0x04,
- 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x6f, 0x72, 0x67, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x12, 0x1a,
- 0x0a, 0x08, 0x64, 0x61, 0x74, 0x61, 0x62, 0x61, 0x73, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09,
- 0x52, 0x08, 0x64, 0x61, 0x74, 0x61, 0x62, 0x61, 0x73, 0x65, 0x12, 0x19, 0x0a, 0x08, 0x6f, 0x72,
- 0x67, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x6f, 0x72,
- 0x67, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x23, 0x0a, 0x0d, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x5f,
- 0x6c, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x0c, 0x63, 0x6f,
- 0x6c, 0x75, 0x6d, 0x6e, 0x4c, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x68,
- 0x61, 0x72, 0x73, 0x65, 0x74, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x07, 0x63, 0x68, 0x61,
- 0x72, 0x73, 0x65, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x64, 0x65, 0x63, 0x69, 0x6d, 0x61, 0x6c, 0x73,
- 0x18, 0x09, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x08, 0x64, 0x65, 0x63, 0x69, 0x6d, 0x61, 0x6c, 0x73,
- 0x12, 0x14, 0x0a, 0x05, 0x66, 0x6c, 0x61, 0x67, 0x73, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0d, 0x52,
- 0x05, 0x66, 0x6c, 0x61, 0x67, 0x73, 0x12, 0x1f, 0x0a, 0x0b, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e,
- 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x63, 0x6f, 0x6c,
- 0x75, 0x6d, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x22, 0x37, 0x0a, 0x03, 0x52, 0x6f, 0x77, 0x12, 0x18,
- 0x0a, 0x07, 0x6c, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x12, 0x52,
- 0x07, 0x6c, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x73, 0x12, 0x16, 0x0a, 0x06, 0x76, 0x61, 0x6c, 0x75,
- 0x65, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x06, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x73,
- 0x22, 0xe3, 0x01, 0x0a, 0x0b, 0x51, 0x75, 0x65, 0x72, 0x79, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74,
- 0x12, 0x24, 0x0a, 0x06, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b,
- 0x32, 0x0c, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x52, 0x06,
- 0x66, 0x69, 0x65, 0x6c, 0x64, 0x73, 0x12, 0x23, 0x0a, 0x0d, 0x72, 0x6f, 0x77, 0x73, 0x5f, 0x61,
- 0x66, 0x66, 0x65, 0x63, 0x74, 0x65, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x52, 0x0c, 0x72,
- 0x6f, 0x77, 0x73, 0x41, 0x66, 0x66, 0x65, 0x63, 0x74, 0x65, 0x64, 0x12, 0x1b, 0x0a, 0x09, 0x69,
- 0x6e, 0x73, 0x65, 0x72, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x04, 0x52, 0x08,
- 0x69, 0x6e, 0x73, 0x65, 0x72, 0x74, 0x49, 0x64, 0x12, 0x1e, 0x0a, 0x04, 0x72, 0x6f, 0x77, 0x73,
- 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x52,
- 0x6f, 0x77, 0x52, 0x04, 0x72, 0x6f, 0x77, 0x73, 0x12, 0x12, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f,
- 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x12, 0x32, 0x0a, 0x15,
- 0x73, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x5f, 0x73, 0x74, 0x61, 0x74, 0x65, 0x5f, 0x63, 0x68,
- 0x61, 0x6e, 0x67, 0x65, 0x73, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x13, 0x73, 0x65, 0x73,
- 0x73, 0x69, 0x6f, 0x6e, 0x53, 0x74, 0x61, 0x74, 0x65, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x73,
- 0x4a, 0x04, 0x08, 0x05, 0x10, 0x06, 0x22, 0x3c, 0x0a, 0x0c, 0x51, 0x75, 0x65, 0x72, 0x79, 0x57,
- 0x61, 0x72, 0x6e, 0x69, 0x6e, 0x67, 0x12, 0x12, 0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01,
- 0x20, 0x01, 0x28, 0x0d, 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x65,
- 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x6d, 0x65, 0x73,
- 0x73, 0x61, 0x67, 0x65, 0x22, 0xa0, 0x03, 0x0a, 0x0b, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x45,
- 0x76, 0x65, 0x6e, 0x74, 0x12, 0x3c, 0x0a, 0x0a, 0x73, 0x74, 0x61, 0x74, 0x65, 0x6d, 0x65, 0x6e,
- 0x74, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79,
- 0x2e, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x2e, 0x53, 0x74, 0x61,
- 0x74, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x0a, 0x73, 0x74, 0x61, 0x74, 0x65, 0x6d, 0x65, 0x6e,
- 0x74, 0x73, 0x12, 0x32, 0x0a, 0x0b, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x5f, 0x74, 0x6f, 0x6b, 0x65,
- 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e,
- 0x45, 0x76, 0x65, 0x6e, 0x74, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x52, 0x0a, 0x65, 0x76, 0x65, 0x6e,
- 0x74, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x1a, 0x9e, 0x02, 0x0a, 0x09, 0x53, 0x74, 0x61, 0x74, 0x65,
- 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x41, 0x0a, 0x08, 0x63, 0x61, 0x74, 0x65, 0x67, 0x6f, 0x72, 0x79,
- 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x25, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x53,
- 0x74, 0x72, 0x65, 0x61, 0x6d, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x2e, 0x53, 0x74, 0x61, 0x74, 0x65,
- 0x6d, 0x65, 0x6e, 0x74, 0x2e, 0x43, 0x61, 0x74, 0x65, 0x67, 0x6f, 0x72, 0x79, 0x52, 0x08, 0x63,
- 0x61, 0x74, 0x65, 0x67, 0x6f, 0x72, 0x79, 0x12, 0x1d, 0x0a, 0x0a, 0x74, 0x61, 0x62, 0x6c, 0x65,
- 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x74, 0x61, 0x62,
- 0x6c, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x3a, 0x0a, 0x12, 0x70, 0x72, 0x69, 0x6d, 0x61, 0x72,
- 0x79, 0x5f, 0x6b, 0x65, 0x79, 0x5f, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x73, 0x18, 0x03, 0x20, 0x03,
- 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x46, 0x69, 0x65, 0x6c, 0x64,
- 0x52, 0x10, 0x70, 0x72, 0x69, 0x6d, 0x61, 0x72, 0x79, 0x4b, 0x65, 0x79, 0x46, 0x69, 0x65, 0x6c,
- 0x64, 0x73, 0x12, 0x38, 0x0a, 0x12, 0x70, 0x72, 0x69, 0x6d, 0x61, 0x72, 0x79, 0x5f, 0x6b, 0x65,
- 0x79, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0a,
- 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x52, 0x6f, 0x77, 0x52, 0x10, 0x70, 0x72, 0x69, 0x6d,
- 0x61, 0x72, 0x79, 0x4b, 0x65, 0x79, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x73, 0x12, 0x10, 0x0a, 0x03,
- 0x73, 0x71, 0x6c, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x03, 0x73, 0x71, 0x6c, 0x22, 0x27,
- 0x0a, 0x08, 0x43, 0x61, 0x74, 0x65, 0x67, 0x6f, 0x72, 0x79, 0x12, 0x09, 0x0a, 0x05, 0x45, 0x72,
- 0x72, 0x6f, 0x72, 0x10, 0x00, 0x12, 0x07, 0x0a, 0x03, 0x44, 0x4d, 0x4c, 0x10, 0x01, 0x12, 0x07,
- 0x0a, 0x03, 0x44, 0x44, 0x4c, 0x10, 0x02, 0x22, 0xe1, 0x02, 0x0a, 0x0e, 0x45, 0x78, 0x65, 0x63,
- 0x75, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x3f, 0x0a, 0x13, 0x65, 0x66,
- 0x66, 0x65, 0x63, 0x74, 0x69, 0x76, 0x65, 0x5f, 0x63, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x5f, 0x69,
- 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x76, 0x74, 0x72, 0x70, 0x63, 0x2e,
- 0x43, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x44, 0x52, 0x11, 0x65, 0x66, 0x66, 0x65, 0x63, 0x74,
- 0x69, 0x76, 0x65, 0x43, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x64, 0x12, 0x45, 0x0a, 0x13, 0x69,
- 0x6d, 0x6d, 0x65, 0x64, 0x69, 0x61, 0x74, 0x65, 0x5f, 0x63, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x5f,
- 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79,
- 0x2e, 0x56, 0x54, 0x47, 0x61, 0x74, 0x65, 0x43, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x44, 0x52,
- 0x11, 0x69, 0x6d, 0x6d, 0x65, 0x64, 0x69, 0x61, 0x74, 0x65, 0x43, 0x61, 0x6c, 0x6c, 0x65, 0x72,
- 0x49, 0x64, 0x12, 0x25, 0x0a, 0x06, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x18, 0x03, 0x20, 0x01,
- 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x54, 0x61, 0x72, 0x67, 0x65,
- 0x74, 0x52, 0x06, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x12, 0x27, 0x0a, 0x05, 0x71, 0x75, 0x65,
- 0x72, 0x79, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79,
- 0x2e, 0x42, 0x6f, 0x75, 0x6e, 0x64, 0x51, 0x75, 0x65, 0x72, 0x79, 0x52, 0x05, 0x71, 0x75, 0x65,
- 0x72, 0x79, 0x12, 0x25, 0x0a, 0x0e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f,
- 0x6e, 0x5f, 0x69, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0d, 0x74, 0x72, 0x61, 0x6e,
- 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x2f, 0x0a, 0x07, 0x6f, 0x70, 0x74,
- 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x71, 0x75, 0x65,
- 0x72, 0x79, 0x2e, 0x45, 0x78, 0x65, 0x63, 0x75, 0x74, 0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e,
- 0x73, 0x52, 0x07, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x1f, 0x0a, 0x0b, 0x72, 0x65,
- 0x73, 0x65, 0x72, 0x76, 0x65, 0x64, 0x5f, 0x69, 0x64, 0x18, 0x07, 0x20, 0x01, 0x28, 0x03, 0x52,
- 0x0a, 0x72, 0x65, 0x73, 0x65, 0x72, 0x76, 0x65, 0x64, 0x49, 0x64, 0x22, 0x3d, 0x0a, 0x0f, 0x45,
- 0x78, 0x65, 0x63, 0x75, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x2a,
- 0x0a, 0x06, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12,
- 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x52, 0x65, 0x73, 0x75,
- 0x6c, 0x74, 0x52, 0x06, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x22, 0x64, 0x0a, 0x0f, 0x52, 0x65,
- 0x73, 0x75, 0x6c, 0x74, 0x57, 0x69, 0x74, 0x68, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x12, 0x25, 0x0a,
- 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x76,
- 0x74, 0x72, 0x70, 0x63, 0x2e, 0x52, 0x50, 0x43, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x52, 0x05, 0x65,
- 0x72, 0x72, 0x6f, 0x72, 0x12, 0x2a, 0x0a, 0x06, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x18, 0x02,
- 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x51, 0x75, 0x65,
- 0x72, 0x79, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x52, 0x06, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74,
- 0x22, 0xe7, 0x02, 0x0a, 0x14, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x45, 0x78, 0x65, 0x63, 0x75,
- 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x3f, 0x0a, 0x13, 0x65, 0x66, 0x66,
- 0x65, 0x63, 0x74, 0x69, 0x76, 0x65, 0x5f, 0x63, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x5f, 0x69, 0x64,
- 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x76, 0x74, 0x72, 0x70, 0x63, 0x2e, 0x43,
- 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x44, 0x52, 0x11, 0x65, 0x66, 0x66, 0x65, 0x63, 0x74, 0x69,
- 0x76, 0x65, 0x43, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x64, 0x12, 0x45, 0x0a, 0x13, 0x69, 0x6d,
- 0x6d, 0x65, 0x64, 0x69, 0x61, 0x74, 0x65, 0x5f, 0x63, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x5f, 0x69,
- 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e,
- 0x56, 0x54, 0x47, 0x61, 0x74, 0x65, 0x43, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x44, 0x52, 0x11,
- 0x69, 0x6d, 0x6d, 0x65, 0x64, 0x69, 0x61, 0x74, 0x65, 0x43, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x49,
- 0x64, 0x12, 0x25, 0x0a, 0x06, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28,
- 0x0b, 0x32, 0x0d, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x54, 0x61, 0x72, 0x67, 0x65, 0x74,
- 0x52, 0x06, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x12, 0x27, 0x0a, 0x05, 0x71, 0x75, 0x65, 0x72,
- 0x79, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e,
- 0x42, 0x6f, 0x75, 0x6e, 0x64, 0x51, 0x75, 0x65, 0x72, 0x79, 0x52, 0x05, 0x71, 0x75, 0x65, 0x72,
- 0x79, 0x12, 0x2f, 0x0a, 0x07, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x05, 0x20, 0x01,
- 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x45, 0x78, 0x65, 0x63, 0x75,
- 0x74, 0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x07, 0x6f, 0x70, 0x74, 0x69, 0x6f,
- 0x6e, 0x73, 0x12, 0x25, 0x0a, 0x0e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f,
- 0x6e, 0x5f, 0x69, 0x64, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0d, 0x74, 0x72, 0x61, 0x6e,
- 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x1f, 0x0a, 0x0b, 0x72, 0x65, 0x73,
- 0x65, 0x72, 0x76, 0x65, 0x64, 0x5f, 0x69, 0x64, 0x18, 0x07, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a,
- 0x72, 0x65, 0x73, 0x65, 0x72, 0x76, 0x65, 0x64, 0x49, 0x64, 0x22, 0x43, 0x0a, 0x15, 0x53, 0x74,
- 0x72, 0x65, 0x61, 0x6d, 0x45, 0x78, 0x65, 0x63, 0x75, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f,
- 0x6e, 0x73, 0x65, 0x12, 0x2a, 0x0a, 0x06, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x18, 0x01, 0x20,
- 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x51, 0x75, 0x65, 0x72,
- 0x79, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x52, 0x06, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x22,
- 0xee, 0x01, 0x0a, 0x0c, 0x42, 0x65, 0x67, 0x69, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
- 0x12, 0x3f, 0x0a, 0x13, 0x65, 0x66, 0x66, 0x65, 0x63, 0x74, 0x69, 0x76, 0x65, 0x5f, 0x63, 0x61,
- 0x6c, 0x6c, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e,
- 0x76, 0x74, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x44, 0x52, 0x11,
- 0x65, 0x66, 0x66, 0x65, 0x63, 0x74, 0x69, 0x76, 0x65, 0x43, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x49,
- 0x64, 0x12, 0x45, 0x0a, 0x13, 0x69, 0x6d, 0x6d, 0x65, 0x64, 0x69, 0x61, 0x74, 0x65, 0x5f, 0x63,
- 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x15,
- 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x56, 0x54, 0x47, 0x61, 0x74, 0x65, 0x43, 0x61, 0x6c,
- 0x6c, 0x65, 0x72, 0x49, 0x44, 0x52, 0x11, 0x69, 0x6d, 0x6d, 0x65, 0x64, 0x69, 0x61, 0x74, 0x65,
- 0x43, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x64, 0x12, 0x25, 0x0a, 0x06, 0x74, 0x61, 0x72, 0x67,
- 0x65, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79,
- 0x2e, 0x54, 0x61, 0x72, 0x67, 0x65, 0x74, 0x52, 0x06, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x12,
- 0x2f, 0x0a, 0x07, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b,
- 0x32, 0x15, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x45, 0x78, 0x65, 0x63, 0x75, 0x74, 0x65,
- 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x07, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73,
- 0x22, 0xa4, 0x01, 0x0a, 0x0d, 0x42, 0x65, 0x67, 0x69, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
- 0x73, 0x65, 0x12, 0x25, 0x0a, 0x0e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f,
- 0x6e, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0d, 0x74, 0x72, 0x61, 0x6e,
- 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x38, 0x0a, 0x0c, 0x74, 0x61, 0x62,
- 0x6c, 0x65, 0x74, 0x5f, 0x61, 0x6c, 0x69, 0x61, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32,
- 0x15, 0x2e, 0x74, 0x6f, 0x70, 0x6f, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x54, 0x61, 0x62, 0x6c, 0x65,
- 0x74, 0x41, 0x6c, 0x69, 0x61, 0x73, 0x52, 0x0b, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x41, 0x6c,
- 0x69, 0x61, 0x73, 0x12, 0x32, 0x0a, 0x15, 0x73, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x5f, 0x73,
- 0x74, 0x61, 0x74, 0x65, 0x5f, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x73, 0x18, 0x03, 0x20, 0x01,
- 0x28, 0x09, 0x52, 0x13, 0x73, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x53, 0x74, 0x61, 0x74, 0x65,
- 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x73, 0x22, 0xe5, 0x01, 0x0a, 0x0d, 0x43, 0x6f, 0x6d, 0x6d,
- 0x69, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x3f, 0x0a, 0x13, 0x65, 0x66, 0x66,
- 0x65, 0x63, 0x74, 0x69, 0x76, 0x65, 0x5f, 0x63, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x5f, 0x69, 0x64,
- 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x76, 0x74, 0x72, 0x70, 0x63, 0x2e, 0x43,
- 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x44, 0x52, 0x11, 0x65, 0x66, 0x66, 0x65, 0x63, 0x74, 0x69,
- 0x76, 0x65, 0x43, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x64, 0x12, 0x45, 0x0a, 0x13, 0x69, 0x6d,
- 0x6d, 0x65, 0x64, 0x69, 0x61, 0x74, 0x65, 0x5f, 0x63, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x5f, 0x69,
- 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e,
- 0x56, 0x54, 0x47, 0x61, 0x74, 0x65, 0x43, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x44, 0x52, 0x11,
- 0x69, 0x6d, 0x6d, 0x65, 0x64, 0x69, 0x61, 0x74, 0x65, 0x43, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x49,
- 0x64, 0x12, 0x25, 0x0a, 0x06, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28,
- 0x0b, 0x32, 0x0d, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x54, 0x61, 0x72, 0x67, 0x65, 0x74,
- 0x52, 0x06, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x12, 0x25, 0x0a, 0x0e, 0x74, 0x72, 0x61, 0x6e,
- 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03,
- 0x52, 0x0d, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x22,
- 0x31, 0x0a, 0x0e, 0x43, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
- 0x65, 0x12, 0x1f, 0x0a, 0x0b, 0x72, 0x65, 0x73, 0x65, 0x72, 0x76, 0x65, 0x64, 0x5f, 0x69, 0x64,
- 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x72, 0x65, 0x73, 0x65, 0x72, 0x76, 0x65, 0x64,
- 0x49, 0x64, 0x22, 0xe7, 0x01, 0x0a, 0x0f, 0x52, 0x6f, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x52,
+ 0x74, 0x12, 0x2f, 0x0a, 0x14, 0x66, 0x65, 0x74, 0x63, 0x68, 0x5f, 0x6c, 0x61, 0x73, 0x74, 0x5f,
+ 0x69, 0x6e, 0x73, 0x65, 0x72, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x12, 0x20, 0x01, 0x28, 0x08, 0x52,
+ 0x11, 0x66, 0x65, 0x74, 0x63, 0x68, 0x4c, 0x61, 0x73, 0x74, 0x49, 0x6e, 0x73, 0x65, 0x72, 0x74,
+ 0x49, 0x64, 0x22, 0x3b, 0x0a, 0x0e, 0x49, 0x6e, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x64, 0x46, 0x69,
+ 0x65, 0x6c, 0x64, 0x73, 0x12, 0x11, 0x0a, 0x0d, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x41, 0x4e, 0x44,
+ 0x5f, 0x4e, 0x41, 0x4d, 0x45, 0x10, 0x00, 0x12, 0x0d, 0x0a, 0x09, 0x54, 0x59, 0x50, 0x45, 0x5f,
+ 0x4f, 0x4e, 0x4c, 0x59, 0x10, 0x01, 0x12, 0x07, 0x0a, 0x03, 0x41, 0x4c, 0x4c, 0x10, 0x02, 0x22,
+ 0x38, 0x0a, 0x08, 0x57, 0x6f, 0x72, 0x6b, 0x6c, 0x6f, 0x61, 0x64, 0x12, 0x0f, 0x0a, 0x0b, 0x55,
+ 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x08, 0x0a, 0x04,
+ 0x4f, 0x4c, 0x54, 0x50, 0x10, 0x01, 0x12, 0x08, 0x0a, 0x04, 0x4f, 0x4c, 0x41, 0x50, 0x10, 0x02,
+ 0x12, 0x07, 0x0a, 0x03, 0x44, 0x42, 0x41, 0x10, 0x03, 0x22, 0xa7, 0x01, 0x0a, 0x14, 0x54, 0x72,
+ 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x73, 0x6f, 0x6c, 0x61, 0x74, 0x69,
+ 0x6f, 0x6e, 0x12, 0x0b, 0x0a, 0x07, 0x44, 0x45, 0x46, 0x41, 0x55, 0x4c, 0x54, 0x10, 0x00, 0x12,
+ 0x13, 0x0a, 0x0f, 0x52, 0x45, 0x50, 0x45, 0x41, 0x54, 0x41, 0x42, 0x4c, 0x45, 0x5f, 0x52, 0x45,
+ 0x41, 0x44, 0x10, 0x01, 0x12, 0x12, 0x0a, 0x0e, 0x52, 0x45, 0x41, 0x44, 0x5f, 0x43, 0x4f, 0x4d,
+ 0x4d, 0x49, 0x54, 0x54, 0x45, 0x44, 0x10, 0x02, 0x12, 0x14, 0x0a, 0x10, 0x52, 0x45, 0x41, 0x44,
+ 0x5f, 0x55, 0x4e, 0x43, 0x4f, 0x4d, 0x4d, 0x49, 0x54, 0x54, 0x45, 0x44, 0x10, 0x03, 0x12, 0x10,
+ 0x0a, 0x0c, 0x53, 0x45, 0x52, 0x49, 0x41, 0x4c, 0x49, 0x5a, 0x41, 0x42, 0x4c, 0x45, 0x10, 0x04,
+ 0x12, 0x21, 0x0a, 0x1d, 0x43, 0x4f, 0x4e, 0x53, 0x49, 0x53, 0x54, 0x45, 0x4e, 0x54, 0x5f, 0x53,
+ 0x4e, 0x41, 0x50, 0x53, 0x48, 0x4f, 0x54, 0x5f, 0x52, 0x45, 0x41, 0x44, 0x5f, 0x4f, 0x4e, 0x4c,
+ 0x59, 0x10, 0x05, 0x12, 0x0e, 0x0a, 0x0a, 0x41, 0x55, 0x54, 0x4f, 0x43, 0x4f, 0x4d, 0x4d, 0x49,
+ 0x54, 0x10, 0x06, 0x22, 0x92, 0x01, 0x0a, 0x0e, 0x50, 0x6c, 0x61, 0x6e, 0x6e, 0x65, 0x72, 0x56,
+ 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x13, 0x0a, 0x0f, 0x44, 0x45, 0x46, 0x41, 0x55, 0x4c,
+ 0x54, 0x5f, 0x50, 0x4c, 0x41, 0x4e, 0x4e, 0x45, 0x52, 0x10, 0x00, 0x12, 0x06, 0x0a, 0x02, 0x56,
+ 0x33, 0x10, 0x01, 0x12, 0x08, 0x0a, 0x04, 0x47, 0x65, 0x6e, 0x34, 0x10, 0x02, 0x12, 0x0e, 0x0a,
+ 0x0a, 0x47, 0x65, 0x6e, 0x34, 0x47, 0x72, 0x65, 0x65, 0x64, 0x79, 0x10, 0x03, 0x12, 0x12, 0x0a,
+ 0x0e, 0x47, 0x65, 0x6e, 0x34, 0x4c, 0x65, 0x66, 0x74, 0x32, 0x52, 0x69, 0x67, 0x68, 0x74, 0x10,
+ 0x04, 0x12, 0x14, 0x0a, 0x10, 0x47, 0x65, 0x6e, 0x34, 0x57, 0x69, 0x74, 0x68, 0x46, 0x61, 0x6c,
+ 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x10, 0x05, 0x12, 0x11, 0x0a, 0x0d, 0x47, 0x65, 0x6e, 0x34, 0x43,
+ 0x6f, 0x6d, 0x70, 0x61, 0x72, 0x65, 0x56, 0x33, 0x10, 0x06, 0x12, 0x0c, 0x0a, 0x08, 0x56, 0x33,
+ 0x49, 0x6e, 0x73, 0x65, 0x72, 0x74, 0x10, 0x07, 0x22, 0x84, 0x01, 0x0a, 0x0c, 0x43, 0x6f, 0x6e,
+ 0x73, 0x6f, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x12, 0x1c, 0x0a, 0x18, 0x43, 0x4f, 0x4e,
+ 0x53, 0x4f, 0x4c, 0x49, 0x44, 0x41, 0x54, 0x4f, 0x52, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43,
+ 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x19, 0x0a, 0x15, 0x43, 0x4f, 0x4e, 0x53, 0x4f,
+ 0x4c, 0x49, 0x44, 0x41, 0x54, 0x4f, 0x52, 0x5f, 0x44, 0x49, 0x53, 0x41, 0x42, 0x4c, 0x45, 0x44,
+ 0x10, 0x01, 0x12, 0x18, 0x0a, 0x14, 0x43, 0x4f, 0x4e, 0x53, 0x4f, 0x4c, 0x49, 0x44, 0x41, 0x54,
+ 0x4f, 0x52, 0x5f, 0x45, 0x4e, 0x41, 0x42, 0x4c, 0x45, 0x44, 0x10, 0x02, 0x12, 0x21, 0x0a, 0x1d,
+ 0x43, 0x4f, 0x4e, 0x53, 0x4f, 0x4c, 0x49, 0x44, 0x41, 0x54, 0x4f, 0x52, 0x5f, 0x45, 0x4e, 0x41,
+ 0x42, 0x4c, 0x45, 0x44, 0x5f, 0x52, 0x45, 0x50, 0x4c, 0x49, 0x43, 0x41, 0x53, 0x10, 0x03, 0x22,
+ 0x4f, 0x0a, 0x15, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x41, 0x63,
+ 0x63, 0x65, 0x73, 0x73, 0x4d, 0x6f, 0x64, 0x65, 0x12, 0x17, 0x0a, 0x13, 0x43, 0x4f, 0x4e, 0x53,
+ 0x49, 0x53, 0x54, 0x45, 0x4e, 0x54, 0x5f, 0x53, 0x4e, 0x41, 0x50, 0x53, 0x48, 0x4f, 0x54, 0x10,
+ 0x00, 0x12, 0x0e, 0x0a, 0x0a, 0x52, 0x45, 0x41, 0x44, 0x5f, 0x57, 0x52, 0x49, 0x54, 0x45, 0x10,
+ 0x01, 0x12, 0x0d, 0x0a, 0x09, 0x52, 0x45, 0x41, 0x44, 0x5f, 0x4f, 0x4e, 0x4c, 0x59, 0x10, 0x02,
+ 0x42, 0x09, 0x0a, 0x07, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x4a, 0x04, 0x08, 0x01, 0x10,
+ 0x02, 0x4a, 0x04, 0x08, 0x02, 0x10, 0x03, 0x4a, 0x04, 0x08, 0x03, 0x10, 0x04, 0x22, 0xb8, 0x02,
+ 0x0a, 0x05, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18,
+ 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x1f, 0x0a, 0x04, 0x74,
+ 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0b, 0x2e, 0x71, 0x75, 0x65, 0x72,
+ 0x79, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05,
+ 0x74, 0x61, 0x62, 0x6c, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x74, 0x61, 0x62,
+ 0x6c, 0x65, 0x12, 0x1b, 0x0a, 0x09, 0x6f, 0x72, 0x67, 0x5f, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x18,
+ 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x6f, 0x72, 0x67, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x12,
+ 0x1a, 0x0a, 0x08, 0x64, 0x61, 0x74, 0x61, 0x62, 0x61, 0x73, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28,
+ 0x09, 0x52, 0x08, 0x64, 0x61, 0x74, 0x61, 0x62, 0x61, 0x73, 0x65, 0x12, 0x19, 0x0a, 0x08, 0x6f,
+ 0x72, 0x67, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x6f,
+ 0x72, 0x67, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x23, 0x0a, 0x0d, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e,
+ 0x5f, 0x6c, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x0c, 0x63,
+ 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x4c, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x12, 0x18, 0x0a, 0x07, 0x63,
+ 0x68, 0x61, 0x72, 0x73, 0x65, 0x74, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x07, 0x63, 0x68,
+ 0x61, 0x72, 0x73, 0x65, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x64, 0x65, 0x63, 0x69, 0x6d, 0x61, 0x6c,
+ 0x73, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x08, 0x64, 0x65, 0x63, 0x69, 0x6d, 0x61, 0x6c,
+ 0x73, 0x12, 0x14, 0x0a, 0x05, 0x66, 0x6c, 0x61, 0x67, 0x73, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0d,
+ 0x52, 0x05, 0x66, 0x6c, 0x61, 0x67, 0x73, 0x12, 0x1f, 0x0a, 0x0b, 0x63, 0x6f, 0x6c, 0x75, 0x6d,
+ 0x6e, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x63, 0x6f,
+ 0x6c, 0x75, 0x6d, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x22, 0x37, 0x0a, 0x03, 0x52, 0x6f, 0x77, 0x12,
+ 0x18, 0x0a, 0x07, 0x6c, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x12,
+ 0x52, 0x07, 0x6c, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x73, 0x12, 0x16, 0x0a, 0x06, 0x76, 0x61, 0x6c,
+ 0x75, 0x65, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x06, 0x76, 0x61, 0x6c, 0x75, 0x65,
+ 0x73, 0x22, 0x8f, 0x02, 0x0a, 0x0b, 0x51, 0x75, 0x65, 0x72, 0x79, 0x52, 0x65, 0x73, 0x75, 0x6c,
+ 0x74, 0x12, 0x24, 0x0a, 0x06, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28,
+ 0x0b, 0x32, 0x0c, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x52,
+ 0x06, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x73, 0x12, 0x23, 0x0a, 0x0d, 0x72, 0x6f, 0x77, 0x73, 0x5f,
+ 0x61, 0x66, 0x66, 0x65, 0x63, 0x74, 0x65, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x52, 0x0c,
+ 0x72, 0x6f, 0x77, 0x73, 0x41, 0x66, 0x66, 0x65, 0x63, 0x74, 0x65, 0x64, 0x12, 0x1b, 0x0a, 0x09,
+ 0x69, 0x6e, 0x73, 0x65, 0x72, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x04, 0x52,
+ 0x08, 0x69, 0x6e, 0x73, 0x65, 0x72, 0x74, 0x49, 0x64, 0x12, 0x1e, 0x0a, 0x04, 0x72, 0x6f, 0x77,
+ 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e,
+ 0x52, 0x6f, 0x77, 0x52, 0x04, 0x72, 0x6f, 0x77, 0x73, 0x12, 0x12, 0x0a, 0x04, 0x69, 0x6e, 0x66,
+ 0x6f, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x12, 0x32, 0x0a,
+ 0x15, 0x73, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x5f, 0x73, 0x74, 0x61, 0x74, 0x65, 0x5f, 0x63,
+ 0x68, 0x61, 0x6e, 0x67, 0x65, 0x73, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x13, 0x73, 0x65,
+ 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x53, 0x74, 0x61, 0x74, 0x65, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65,
+ 0x73, 0x12, 0x2a, 0x0a, 0x11, 0x69, 0x6e, 0x73, 0x65, 0x72, 0x74, 0x5f, 0x69, 0x64, 0x5f, 0x63,
+ 0x68, 0x61, 0x6e, 0x67, 0x65, 0x64, 0x18, 0x08, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0f, 0x69, 0x6e,
+ 0x73, 0x65, 0x72, 0x74, 0x49, 0x64, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x64, 0x4a, 0x04, 0x08,
+ 0x05, 0x10, 0x06, 0x22, 0x3c, 0x0a, 0x0c, 0x51, 0x75, 0x65, 0x72, 0x79, 0x57, 0x61, 0x72, 0x6e,
+ 0x69, 0x6e, 0x67, 0x12, 0x12, 0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28,
+ 0x0d, 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61,
+ 0x67, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67,
+ 0x65, 0x22, 0xa0, 0x03, 0x0a, 0x0b, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x45, 0x76, 0x65, 0x6e,
+ 0x74, 0x12, 0x3c, 0x0a, 0x0a, 0x73, 0x74, 0x61, 0x74, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x18,
+ 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x53, 0x74,
+ 0x72, 0x65, 0x61, 0x6d, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x2e, 0x53, 0x74, 0x61, 0x74, 0x65, 0x6d,
+ 0x65, 0x6e, 0x74, 0x52, 0x0a, 0x73, 0x74, 0x61, 0x74, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x12,
+ 0x32, 0x0a, 0x0b, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x5f, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x18, 0x02,
+ 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x45, 0x76, 0x65,
+ 0x6e, 0x74, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x52, 0x0a, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x54, 0x6f,
+ 0x6b, 0x65, 0x6e, 0x1a, 0x9e, 0x02, 0x0a, 0x09, 0x53, 0x74, 0x61, 0x74, 0x65, 0x6d, 0x65, 0x6e,
+ 0x74, 0x12, 0x41, 0x0a, 0x08, 0x63, 0x61, 0x74, 0x65, 0x67, 0x6f, 0x72, 0x79, 0x18, 0x01, 0x20,
+ 0x01, 0x28, 0x0e, 0x32, 0x25, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x53, 0x74, 0x72, 0x65,
+ 0x61, 0x6d, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x2e, 0x53, 0x74, 0x61, 0x74, 0x65, 0x6d, 0x65, 0x6e,
+ 0x74, 0x2e, 0x43, 0x61, 0x74, 0x65, 0x67, 0x6f, 0x72, 0x79, 0x52, 0x08, 0x63, 0x61, 0x74, 0x65,
+ 0x67, 0x6f, 0x72, 0x79, 0x12, 0x1d, 0x0a, 0x0a, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x6e, 0x61,
+ 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x4e,
+ 0x61, 0x6d, 0x65, 0x12, 0x3a, 0x0a, 0x12, 0x70, 0x72, 0x69, 0x6d, 0x61, 0x72, 0x79, 0x5f, 0x6b,
+ 0x65, 0x79, 0x5f, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32,
+ 0x0c, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x52, 0x10, 0x70,
+ 0x72, 0x69, 0x6d, 0x61, 0x72, 0x79, 0x4b, 0x65, 0x79, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x73, 0x12,
+ 0x38, 0x0a, 0x12, 0x70, 0x72, 0x69, 0x6d, 0x61, 0x72, 0x79, 0x5f, 0x6b, 0x65, 0x79, 0x5f, 0x76,
+ 0x61, 0x6c, 0x75, 0x65, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x71, 0x75,
+ 0x65, 0x72, 0x79, 0x2e, 0x52, 0x6f, 0x77, 0x52, 0x10, 0x70, 0x72, 0x69, 0x6d, 0x61, 0x72, 0x79,
+ 0x4b, 0x65, 0x79, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x73, 0x12, 0x10, 0x0a, 0x03, 0x73, 0x71, 0x6c,
+ 0x18, 0x05, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x03, 0x73, 0x71, 0x6c, 0x22, 0x27, 0x0a, 0x08, 0x43,
+ 0x61, 0x74, 0x65, 0x67, 0x6f, 0x72, 0x79, 0x12, 0x09, 0x0a, 0x05, 0x45, 0x72, 0x72, 0x6f, 0x72,
+ 0x10, 0x00, 0x12, 0x07, 0x0a, 0x03, 0x44, 0x4d, 0x4c, 0x10, 0x01, 0x12, 0x07, 0x0a, 0x03, 0x44,
+ 0x44, 0x4c, 0x10, 0x02, 0x22, 0xe1, 0x02, 0x0a, 0x0e, 0x45, 0x78, 0x65, 0x63, 0x75, 0x74, 0x65,
+ 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x3f, 0x0a, 0x13, 0x65, 0x66, 0x66, 0x65, 0x63,
+ 0x74, 0x69, 0x76, 0x65, 0x5f, 0x63, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x01,
+ 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x76, 0x74, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x61, 0x6c,
+ 0x6c, 0x65, 0x72, 0x49, 0x44, 0x52, 0x11, 0x65, 0x66, 0x66, 0x65, 0x63, 0x74, 0x69, 0x76, 0x65,
+ 0x43, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x64, 0x12, 0x45, 0x0a, 0x13, 0x69, 0x6d, 0x6d, 0x65,
+ 0x64, 0x69, 0x61, 0x74, 0x65, 0x5f, 0x63, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18,
+ 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x56, 0x54,
+ 0x47, 0x61, 0x74, 0x65, 0x43, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x44, 0x52, 0x11, 0x69, 0x6d,
+ 0x6d, 0x65, 0x64, 0x69, 0x61, 0x74, 0x65, 0x43, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x64, 0x12,
+ 0x25, 0x0a, 0x06, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32,
+ 0x0d, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x54, 0x61, 0x72, 0x67, 0x65, 0x74, 0x52, 0x06,
+ 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x12, 0x27, 0x0a, 0x05, 0x71, 0x75, 0x65, 0x72, 0x79, 0x18,
+ 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x42, 0x6f,
+ 0x75, 0x6e, 0x64, 0x51, 0x75, 0x65, 0x72, 0x79, 0x52, 0x05, 0x71, 0x75, 0x65, 0x72, 0x79, 0x12,
+ 0x25, 0x0a, 0x0e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x69,
+ 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0d, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63,
+ 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x2f, 0x0a, 0x07, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e,
+ 0x73, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e,
+ 0x45, 0x78, 0x65, 0x63, 0x75, 0x74, 0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x07,
+ 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x1f, 0x0a, 0x0b, 0x72, 0x65, 0x73, 0x65, 0x72,
+ 0x76, 0x65, 0x64, 0x5f, 0x69, 0x64, 0x18, 0x07, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x72, 0x65,
+ 0x73, 0x65, 0x72, 0x76, 0x65, 0x64, 0x49, 0x64, 0x22, 0x3d, 0x0a, 0x0f, 0x45, 0x78, 0x65, 0x63,
+ 0x75, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x2a, 0x0a, 0x06, 0x72,
+ 0x65, 0x73, 0x75, 0x6c, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x71, 0x75,
+ 0x65, 0x72, 0x79, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x52,
+ 0x06, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x22, 0x64, 0x0a, 0x0f, 0x52, 0x65, 0x73, 0x75, 0x6c,
+ 0x74, 0x57, 0x69, 0x74, 0x68, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x12, 0x25, 0x0a, 0x05, 0x65, 0x72,
+ 0x72, 0x6f, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x76, 0x74, 0x72, 0x70,
+ 0x63, 0x2e, 0x52, 0x50, 0x43, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x52, 0x05, 0x65, 0x72, 0x72, 0x6f,
+ 0x72, 0x12, 0x2a, 0x0a, 0x06, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28,
+ 0x0b, 0x32, 0x12, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x52,
+ 0x65, 0x73, 0x75, 0x6c, 0x74, 0x52, 0x06, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x22, 0xe7, 0x02,
+ 0x0a, 0x14, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x45, 0x78, 0x65, 0x63, 0x75, 0x74, 0x65, 0x52,
+ 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x3f, 0x0a, 0x13, 0x65, 0x66, 0x66, 0x65, 0x63, 0x74,
+ 0x69, 0x76, 0x65, 0x5f, 0x63, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20,
+ 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x76, 0x74, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x61, 0x6c, 0x6c,
+ 0x65, 0x72, 0x49, 0x44, 0x52, 0x11, 0x65, 0x66, 0x66, 0x65, 0x63, 0x74, 0x69, 0x76, 0x65, 0x43,
+ 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x64, 0x12, 0x45, 0x0a, 0x13, 0x69, 0x6d, 0x6d, 0x65, 0x64,
+ 0x69, 0x61, 0x74, 0x65, 0x5f, 0x63, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x02,
+ 0x20, 0x01, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x56, 0x54, 0x47,
+ 0x61, 0x74, 0x65, 0x43, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x44, 0x52, 0x11, 0x69, 0x6d, 0x6d,
+ 0x65, 0x64, 0x69, 0x61, 0x74, 0x65, 0x43, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x64, 0x12, 0x25,
+ 0x0a, 0x06, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d,
+ 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x54, 0x61, 0x72, 0x67, 0x65, 0x74, 0x52, 0x06, 0x74,
+ 0x61, 0x72, 0x67, 0x65, 0x74, 0x12, 0x27, 0x0a, 0x05, 0x71, 0x75, 0x65, 0x72, 0x79, 0x18, 0x04,
+ 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x42, 0x6f, 0x75,
+ 0x6e, 0x64, 0x51, 0x75, 0x65, 0x72, 0x79, 0x52, 0x05, 0x71, 0x75, 0x65, 0x72, 0x79, 0x12, 0x2f,
+ 0x0a, 0x07, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32,
+ 0x15, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x45, 0x78, 0x65, 0x63, 0x75, 0x74, 0x65, 0x4f,
+ 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x07, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12,
+ 0x25, 0x0a, 0x0e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x69,
+ 0x64, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0d, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63,
+ 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x1f, 0x0a, 0x0b, 0x72, 0x65, 0x73, 0x65, 0x72, 0x76,
+ 0x65, 0x64, 0x5f, 0x69, 0x64, 0x18, 0x07, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x72, 0x65, 0x73,
+ 0x65, 0x72, 0x76, 0x65, 0x64, 0x49, 0x64, 0x22, 0x43, 0x0a, 0x15, 0x53, 0x74, 0x72, 0x65, 0x61,
+ 0x6d, 0x45, 0x78, 0x65, 0x63, 0x75, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
+ 0x12, 0x2a, 0x0a, 0x06, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b,
+ 0x32, 0x12, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x52, 0x65,
+ 0x73, 0x75, 0x6c, 0x74, 0x52, 0x06, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x22, 0xee, 0x01, 0x0a,
+ 0x0c, 0x42, 0x65, 0x67, 0x69, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x3f, 0x0a,
+ 0x13, 0x65, 0x66, 0x66, 0x65, 0x63, 0x74, 0x69, 0x76, 0x65, 0x5f, 0x63, 0x61, 0x6c, 0x6c, 0x65,
+ 0x72, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x76, 0x74, 0x72,
+ 0x70, 0x63, 0x2e, 0x43, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x44, 0x52, 0x11, 0x65, 0x66, 0x66,
+ 0x65, 0x63, 0x74, 0x69, 0x76, 0x65, 0x43, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x64, 0x12, 0x45,
+ 0x0a, 0x13, 0x69, 0x6d, 0x6d, 0x65, 0x64, 0x69, 0x61, 0x74, 0x65, 0x5f, 0x63, 0x61, 0x6c, 0x6c,
+ 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x71, 0x75,
+ 0x65, 0x72, 0x79, 0x2e, 0x56, 0x54, 0x47, 0x61, 0x74, 0x65, 0x43, 0x61, 0x6c, 0x6c, 0x65, 0x72,
+ 0x49, 0x44, 0x52, 0x11, 0x69, 0x6d, 0x6d, 0x65, 0x64, 0x69, 0x61, 0x74, 0x65, 0x43, 0x61, 0x6c,
+ 0x6c, 0x65, 0x72, 0x49, 0x64, 0x12, 0x25, 0x0a, 0x06, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x18,
+ 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x54, 0x61,
+ 0x72, 0x67, 0x65, 0x74, 0x52, 0x06, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x12, 0x2f, 0x0a, 0x07,
+ 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x15, 0x2e,
+ 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x45, 0x78, 0x65, 0x63, 0x75, 0x74, 0x65, 0x4f, 0x70, 0x74,
+ 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x07, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0xa4, 0x01,
+ 0x0a, 0x0d, 0x42, 0x65, 0x67, 0x69, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12,
+ 0x25, 0x0a, 0x0e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x69,
+ 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0d, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63,
+ 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x38, 0x0a, 0x0c, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74,
+ 0x5f, 0x61, 0x6c, 0x69, 0x61, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x74,
+ 0x6f, 0x70, 0x6f, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x41, 0x6c,
+ 0x69, 0x61, 0x73, 0x52, 0x0b, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x41, 0x6c, 0x69, 0x61, 0x73,
+ 0x12, 0x32, 0x0a, 0x15, 0x73, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x5f, 0x73, 0x74, 0x61, 0x74,
+ 0x65, 0x5f, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52,
+ 0x13, 0x73, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x53, 0x74, 0x61, 0x74, 0x65, 0x43, 0x68, 0x61,
+ 0x6e, 0x67, 0x65, 0x73, 0x22, 0xe5, 0x01, 0x0a, 0x0d, 0x43, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x52,
0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x3f, 0x0a, 0x13, 0x65, 0x66, 0x66, 0x65, 0x63, 0x74,
0x69, 0x76, 0x65, 0x5f, 0x63, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20,
0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x76, 0x74, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x61, 0x6c, 0x6c,
@@ -6133,81 +6141,29 @@ var file_query_proto_rawDesc = []byte{
0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x54, 0x61, 0x72, 0x67, 0x65, 0x74, 0x52, 0x06, 0x74,
0x61, 0x72, 0x67, 0x65, 0x74, 0x12, 0x25, 0x0a, 0x0e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63,
0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0d, 0x74,
- 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x22, 0x33, 0x0a, 0x10,
- 0x52, 0x6f, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
- 0x12, 0x1f, 0x0a, 0x0b, 0x72, 0x65, 0x73, 0x65, 0x72, 0x76, 0x65, 0x64, 0x5f, 0x69, 0x64, 0x18,
- 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x72, 0x65, 0x73, 0x65, 0x72, 0x76, 0x65, 0x64, 0x49,
- 0x64, 0x22, 0xfa, 0x01, 0x0a, 0x0e, 0x50, 0x72, 0x65, 0x70, 0x61, 0x72, 0x65, 0x52, 0x65, 0x71,
- 0x75, 0x65, 0x73, 0x74, 0x12, 0x3f, 0x0a, 0x13, 0x65, 0x66, 0x66, 0x65, 0x63, 0x74, 0x69, 0x76,
- 0x65, 0x5f, 0x63, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
- 0x0b, 0x32, 0x0f, 0x2e, 0x76, 0x74, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x61, 0x6c, 0x6c, 0x65, 0x72,
- 0x49, 0x44, 0x52, 0x11, 0x65, 0x66, 0x66, 0x65, 0x63, 0x74, 0x69, 0x76, 0x65, 0x43, 0x61, 0x6c,
- 0x6c, 0x65, 0x72, 0x49, 0x64, 0x12, 0x45, 0x0a, 0x13, 0x69, 0x6d, 0x6d, 0x65, 0x64, 0x69, 0x61,
- 0x74, 0x65, 0x5f, 0x63, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01,
- 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x56, 0x54, 0x47, 0x61, 0x74,
- 0x65, 0x43, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x44, 0x52, 0x11, 0x69, 0x6d, 0x6d, 0x65, 0x64,
- 0x69, 0x61, 0x74, 0x65, 0x43, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x64, 0x12, 0x25, 0x0a, 0x06,
- 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x71,
- 0x75, 0x65, 0x72, 0x79, 0x2e, 0x54, 0x61, 0x72, 0x67, 0x65, 0x74, 0x52, 0x06, 0x74, 0x61, 0x72,
- 0x67, 0x65, 0x74, 0x12, 0x25, 0x0a, 0x0e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69,
- 0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0d, 0x74, 0x72, 0x61,
- 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x64, 0x74,
- 0x69, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x64, 0x74, 0x69, 0x64, 0x22, 0x11,
- 0x0a, 0x0f, 0x50, 0x72, 0x65, 0x70, 0x61, 0x72, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
- 0x65, 0x22, 0xda, 0x01, 0x0a, 0x15, 0x43, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x50, 0x72, 0x65, 0x70,
- 0x61, 0x72, 0x65, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x3f, 0x0a, 0x13, 0x65,
- 0x66, 0x66, 0x65, 0x63, 0x74, 0x69, 0x76, 0x65, 0x5f, 0x63, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x5f,
- 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x76, 0x74, 0x72, 0x70, 0x63,
- 0x2e, 0x43, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x44, 0x52, 0x11, 0x65, 0x66, 0x66, 0x65, 0x63,
- 0x74, 0x69, 0x76, 0x65, 0x43, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x64, 0x12, 0x45, 0x0a, 0x13,
- 0x69, 0x6d, 0x6d, 0x65, 0x64, 0x69, 0x61, 0x74, 0x65, 0x5f, 0x63, 0x61, 0x6c, 0x6c, 0x65, 0x72,
- 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x71, 0x75, 0x65, 0x72,
- 0x79, 0x2e, 0x56, 0x54, 0x47, 0x61, 0x74, 0x65, 0x43, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x44,
- 0x52, 0x11, 0x69, 0x6d, 0x6d, 0x65, 0x64, 0x69, 0x61, 0x74, 0x65, 0x43, 0x61, 0x6c, 0x6c, 0x65,
- 0x72, 0x49, 0x64, 0x12, 0x25, 0x0a, 0x06, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x18, 0x03, 0x20,
- 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x54, 0x61, 0x72, 0x67,
- 0x65, 0x74, 0x52, 0x06, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x64, 0x74,
- 0x69, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x64, 0x74, 0x69, 0x64, 0x22, 0x18,
- 0x0a, 0x16, 0x43, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x50, 0x72, 0x65, 0x70, 0x61, 0x72, 0x65, 0x64,
- 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x83, 0x02, 0x0a, 0x17, 0x52, 0x6f, 0x6c,
- 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x50, 0x72, 0x65, 0x70, 0x61, 0x72, 0x65, 0x64, 0x52, 0x65, 0x71,
- 0x75, 0x65, 0x73, 0x74, 0x12, 0x3f, 0x0a, 0x13, 0x65, 0x66, 0x66, 0x65, 0x63, 0x74, 0x69, 0x76,
- 0x65, 0x5f, 0x63, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
- 0x0b, 0x32, 0x0f, 0x2e, 0x76, 0x74, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x61, 0x6c, 0x6c, 0x65, 0x72,
- 0x49, 0x44, 0x52, 0x11, 0x65, 0x66, 0x66, 0x65, 0x63, 0x74, 0x69, 0x76, 0x65, 0x43, 0x61, 0x6c,
- 0x6c, 0x65, 0x72, 0x49, 0x64, 0x12, 0x45, 0x0a, 0x13, 0x69, 0x6d, 0x6d, 0x65, 0x64, 0x69, 0x61,
- 0x74, 0x65, 0x5f, 0x63, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01,
- 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x56, 0x54, 0x47, 0x61, 0x74,
- 0x65, 0x43, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x44, 0x52, 0x11, 0x69, 0x6d, 0x6d, 0x65, 0x64,
- 0x69, 0x61, 0x74, 0x65, 0x43, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x64, 0x12, 0x25, 0x0a, 0x06,
- 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x71,
- 0x75, 0x65, 0x72, 0x79, 0x2e, 0x54, 0x61, 0x72, 0x67, 0x65, 0x74, 0x52, 0x06, 0x74, 0x61, 0x72,
- 0x67, 0x65, 0x74, 0x12, 0x25, 0x0a, 0x0e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69,
- 0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0d, 0x74, 0x72, 0x61,
- 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x64, 0x74,
- 0x69, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x64, 0x74, 0x69, 0x64, 0x22, 0x1a,
- 0x0a, 0x18, 0x52, 0x6f, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x50, 0x72, 0x65, 0x70, 0x61, 0x72,
- 0x65, 0x64, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x90, 0x02, 0x0a, 0x18, 0x43,
- 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e,
- 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x3f, 0x0a, 0x13, 0x65, 0x66, 0x66, 0x65, 0x63,
- 0x74, 0x69, 0x76, 0x65, 0x5f, 0x63, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x01,
- 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x76, 0x74, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x61, 0x6c,
- 0x6c, 0x65, 0x72, 0x49, 0x44, 0x52, 0x11, 0x65, 0x66, 0x66, 0x65, 0x63, 0x74, 0x69, 0x76, 0x65,
- 0x43, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x64, 0x12, 0x45, 0x0a, 0x13, 0x69, 0x6d, 0x6d, 0x65,
- 0x64, 0x69, 0x61, 0x74, 0x65, 0x5f, 0x63, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18,
- 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x56, 0x54,
- 0x47, 0x61, 0x74, 0x65, 0x43, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x44, 0x52, 0x11, 0x69, 0x6d,
- 0x6d, 0x65, 0x64, 0x69, 0x61, 0x74, 0x65, 0x43, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x64, 0x12,
- 0x25, 0x0a, 0x06, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32,
- 0x0d, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x54, 0x61, 0x72, 0x67, 0x65, 0x74, 0x52, 0x06,
- 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x64, 0x74, 0x69, 0x64, 0x18, 0x04,
- 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x64, 0x74, 0x69, 0x64, 0x12, 0x31, 0x0a, 0x0c, 0x70, 0x61,
- 0x72, 0x74, 0x69, 0x63, 0x69, 0x70, 0x61, 0x6e, 0x74, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b,
- 0x32, 0x0d, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x54, 0x61, 0x72, 0x67, 0x65, 0x74, 0x52,
- 0x0c, 0x70, 0x61, 0x72, 0x74, 0x69, 0x63, 0x69, 0x70, 0x61, 0x6e, 0x74, 0x73, 0x22, 0x1b, 0x0a,
- 0x19, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69,
- 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0xfe, 0x01, 0x0a, 0x12, 0x53,
- 0x74, 0x61, 0x72, 0x74, 0x43, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
+ 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x22, 0x31, 0x0a, 0x0e,
+ 0x43, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x1f,
+ 0x0a, 0x0b, 0x72, 0x65, 0x73, 0x65, 0x72, 0x76, 0x65, 0x64, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20,
+ 0x01, 0x28, 0x03, 0x52, 0x0a, 0x72, 0x65, 0x73, 0x65, 0x72, 0x76, 0x65, 0x64, 0x49, 0x64, 0x22,
+ 0xe7, 0x01, 0x0a, 0x0f, 0x52, 0x6f, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x52, 0x65, 0x71, 0x75,
+ 0x65, 0x73, 0x74, 0x12, 0x3f, 0x0a, 0x13, 0x65, 0x66, 0x66, 0x65, 0x63, 0x74, 0x69, 0x76, 0x65,
+ 0x5f, 0x63, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b,
+ 0x32, 0x0f, 0x2e, 0x76, 0x74, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x49,
+ 0x44, 0x52, 0x11, 0x65, 0x66, 0x66, 0x65, 0x63, 0x74, 0x69, 0x76, 0x65, 0x43, 0x61, 0x6c, 0x6c,
+ 0x65, 0x72, 0x49, 0x64, 0x12, 0x45, 0x0a, 0x13, 0x69, 0x6d, 0x6d, 0x65, 0x64, 0x69, 0x61, 0x74,
+ 0x65, 0x5f, 0x63, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28,
+ 0x0b, 0x32, 0x15, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x56, 0x54, 0x47, 0x61, 0x74, 0x65,
+ 0x43, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x44, 0x52, 0x11, 0x69, 0x6d, 0x6d, 0x65, 0x64, 0x69,
+ 0x61, 0x74, 0x65, 0x43, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x64, 0x12, 0x25, 0x0a, 0x06, 0x74,
+ 0x61, 0x72, 0x67, 0x65, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x71, 0x75,
+ 0x65, 0x72, 0x79, 0x2e, 0x54, 0x61, 0x72, 0x67, 0x65, 0x74, 0x52, 0x06, 0x74, 0x61, 0x72, 0x67,
+ 0x65, 0x74, 0x12, 0x25, 0x0a, 0x0e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f,
+ 0x6e, 0x5f, 0x69, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0d, 0x74, 0x72, 0x61, 0x6e,
+ 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x22, 0x33, 0x0a, 0x10, 0x52, 0x6f, 0x6c,
+ 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x1f, 0x0a,
+ 0x0b, 0x72, 0x65, 0x73, 0x65, 0x72, 0x76, 0x65, 0x64, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01,
+ 0x28, 0x03, 0x52, 0x0a, 0x72, 0x65, 0x73, 0x65, 0x72, 0x76, 0x65, 0x64, 0x49, 0x64, 0x22, 0xfa,
+ 0x01, 0x0a, 0x0e, 0x50, 0x72, 0x65, 0x70, 0x61, 0x72, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
0x74, 0x12, 0x3f, 0x0a, 0x13, 0x65, 0x66, 0x66, 0x65, 0x63, 0x74, 0x69, 0x76, 0x65, 0x5f, 0x63,
0x61, 0x6c, 0x6c, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f,
0x2e, 0x76, 0x74, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x44, 0x52,
@@ -6222,31 +6178,10 @@ var file_query_proto_rawDesc = []byte{
0x12, 0x25, 0x0a, 0x0e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f,
0x69, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0d, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61,
0x63, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x64, 0x74, 0x69, 0x64, 0x18,
- 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x64, 0x74, 0x69, 0x64, 0x22, 0x44, 0x0a, 0x13, 0x53,
- 0x74, 0x61, 0x72, 0x74, 0x43, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
- 0x73, 0x65, 0x12, 0x2d, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28,
- 0x0e, 0x32, 0x17, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x53, 0x74, 0x61, 0x72, 0x74, 0x43,
- 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x05, 0x73, 0x74, 0x61, 0x74,
- 0x65, 0x22, 0xfe, 0x01, 0x0a, 0x12, 0x53, 0x65, 0x74, 0x52, 0x6f, 0x6c, 0x6c, 0x62, 0x61, 0x63,
- 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x3f, 0x0a, 0x13, 0x65, 0x66, 0x66, 0x65,
- 0x63, 0x74, 0x69, 0x76, 0x65, 0x5f, 0x63, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18,
- 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x76, 0x74, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x61,
- 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x44, 0x52, 0x11, 0x65, 0x66, 0x66, 0x65, 0x63, 0x74, 0x69, 0x76,
- 0x65, 0x43, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x64, 0x12, 0x45, 0x0a, 0x13, 0x69, 0x6d, 0x6d,
- 0x65, 0x64, 0x69, 0x61, 0x74, 0x65, 0x5f, 0x63, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x5f, 0x69, 0x64,
- 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x56,
- 0x54, 0x47, 0x61, 0x74, 0x65, 0x43, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x44, 0x52, 0x11, 0x69,
- 0x6d, 0x6d, 0x65, 0x64, 0x69, 0x61, 0x74, 0x65, 0x43, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x64,
- 0x12, 0x25, 0x0a, 0x06, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b,
- 0x32, 0x0d, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x54, 0x61, 0x72, 0x67, 0x65, 0x74, 0x52,
- 0x06, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x12, 0x25, 0x0a, 0x0e, 0x74, 0x72, 0x61, 0x6e, 0x73,
- 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52,
- 0x0d, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x12,
- 0x0a, 0x04, 0x64, 0x74, 0x69, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x64, 0x74,
- 0x69, 0x64, 0x22, 0x15, 0x0a, 0x13, 0x53, 0x65, 0x74, 0x52, 0x6f, 0x6c, 0x6c, 0x62, 0x61, 0x63,
- 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0xdf, 0x01, 0x0a, 0x1a, 0x43, 0x6f,
- 0x6e, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f,
- 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x3f, 0x0a, 0x13, 0x65, 0x66, 0x66, 0x65,
+ 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x64, 0x74, 0x69, 0x64, 0x22, 0x11, 0x0a, 0x0f, 0x50,
+ 0x72, 0x65, 0x70, 0x61, 0x72, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0xda,
+ 0x01, 0x0a, 0x15, 0x43, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x50, 0x72, 0x65, 0x70, 0x61, 0x72, 0x65,
+ 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x3f, 0x0a, 0x13, 0x65, 0x66, 0x66, 0x65,
0x63, 0x74, 0x69, 0x76, 0x65, 0x5f, 0x63, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18,
0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x76, 0x74, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x61,
0x6c, 0x6c, 0x65, 0x72, 0x49, 0x44, 0x52, 0x11, 0x65, 0x66, 0x66, 0x65, 0x63, 0x74, 0x69, 0x76,
@@ -6258,10 +6193,85 @@ var file_query_proto_rawDesc = []byte{
0x12, 0x25, 0x0a, 0x06, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b,
0x32, 0x0d, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x54, 0x61, 0x72, 0x67, 0x65, 0x74, 0x52,
0x06, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x64, 0x74, 0x69, 0x64, 0x18,
- 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x64, 0x74, 0x69, 0x64, 0x22, 0x1d, 0x0a, 0x1b, 0x43,
- 0x6f, 0x6e, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69,
- 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0xdb, 0x01, 0x0a, 0x16, 0x52,
- 0x65, 0x61, 0x64, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65,
+ 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x64, 0x74, 0x69, 0x64, 0x22, 0x18, 0x0a, 0x16, 0x43,
+ 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x50, 0x72, 0x65, 0x70, 0x61, 0x72, 0x65, 0x64, 0x52, 0x65, 0x73,
+ 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x83, 0x02, 0x0a, 0x17, 0x52, 0x6f, 0x6c, 0x6c, 0x62, 0x61,
+ 0x63, 0x6b, 0x50, 0x72, 0x65, 0x70, 0x61, 0x72, 0x65, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
+ 0x74, 0x12, 0x3f, 0x0a, 0x13, 0x65, 0x66, 0x66, 0x65, 0x63, 0x74, 0x69, 0x76, 0x65, 0x5f, 0x63,
+ 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f,
+ 0x2e, 0x76, 0x74, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x44, 0x52,
+ 0x11, 0x65, 0x66, 0x66, 0x65, 0x63, 0x74, 0x69, 0x76, 0x65, 0x43, 0x61, 0x6c, 0x6c, 0x65, 0x72,
+ 0x49, 0x64, 0x12, 0x45, 0x0a, 0x13, 0x69, 0x6d, 0x6d, 0x65, 0x64, 0x69, 0x61, 0x74, 0x65, 0x5f,
+ 0x63, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32,
+ 0x15, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x56, 0x54, 0x47, 0x61, 0x74, 0x65, 0x43, 0x61,
+ 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x44, 0x52, 0x11, 0x69, 0x6d, 0x6d, 0x65, 0x64, 0x69, 0x61, 0x74,
+ 0x65, 0x43, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x64, 0x12, 0x25, 0x0a, 0x06, 0x74, 0x61, 0x72,
+ 0x67, 0x65, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x71, 0x75, 0x65, 0x72,
+ 0x79, 0x2e, 0x54, 0x61, 0x72, 0x67, 0x65, 0x74, 0x52, 0x06, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74,
+ 0x12, 0x25, 0x0a, 0x0e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f,
+ 0x69, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0d, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61,
+ 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x64, 0x74, 0x69, 0x64, 0x18,
+ 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x64, 0x74, 0x69, 0x64, 0x22, 0x1a, 0x0a, 0x18, 0x52,
+ 0x6f, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x50, 0x72, 0x65, 0x70, 0x61, 0x72, 0x65, 0x64, 0x52,
+ 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x90, 0x02, 0x0a, 0x18, 0x43, 0x72, 0x65, 0x61,
+ 0x74, 0x65, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71,
+ 0x75, 0x65, 0x73, 0x74, 0x12, 0x3f, 0x0a, 0x13, 0x65, 0x66, 0x66, 0x65, 0x63, 0x74, 0x69, 0x76,
+ 0x65, 0x5f, 0x63, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
+ 0x0b, 0x32, 0x0f, 0x2e, 0x76, 0x74, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x61, 0x6c, 0x6c, 0x65, 0x72,
+ 0x49, 0x44, 0x52, 0x11, 0x65, 0x66, 0x66, 0x65, 0x63, 0x74, 0x69, 0x76, 0x65, 0x43, 0x61, 0x6c,
+ 0x6c, 0x65, 0x72, 0x49, 0x64, 0x12, 0x45, 0x0a, 0x13, 0x69, 0x6d, 0x6d, 0x65, 0x64, 0x69, 0x61,
+ 0x74, 0x65, 0x5f, 0x63, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01,
+ 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x56, 0x54, 0x47, 0x61, 0x74,
+ 0x65, 0x43, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x44, 0x52, 0x11, 0x69, 0x6d, 0x6d, 0x65, 0x64,
+ 0x69, 0x61, 0x74, 0x65, 0x43, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x64, 0x12, 0x25, 0x0a, 0x06,
+ 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x71,
+ 0x75, 0x65, 0x72, 0x79, 0x2e, 0x54, 0x61, 0x72, 0x67, 0x65, 0x74, 0x52, 0x06, 0x74, 0x61, 0x72,
+ 0x67, 0x65, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x64, 0x74, 0x69, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28,
+ 0x09, 0x52, 0x04, 0x64, 0x74, 0x69, 0x64, 0x12, 0x31, 0x0a, 0x0c, 0x70, 0x61, 0x72, 0x74, 0x69,
+ 0x63, 0x69, 0x70, 0x61, 0x6e, 0x74, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e,
+ 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x54, 0x61, 0x72, 0x67, 0x65, 0x74, 0x52, 0x0c, 0x70, 0x61,
+ 0x72, 0x74, 0x69, 0x63, 0x69, 0x70, 0x61, 0x6e, 0x74, 0x73, 0x22, 0x1b, 0x0a, 0x19, 0x43, 0x72,
+ 0x65, 0x61, 0x74, 0x65, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52,
+ 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0xfe, 0x01, 0x0a, 0x12, 0x53, 0x74, 0x61, 0x72,
+ 0x74, 0x43, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x3f,
+ 0x0a, 0x13, 0x65, 0x66, 0x66, 0x65, 0x63, 0x74, 0x69, 0x76, 0x65, 0x5f, 0x63, 0x61, 0x6c, 0x6c,
+ 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x76, 0x74,
+ 0x72, 0x70, 0x63, 0x2e, 0x43, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x44, 0x52, 0x11, 0x65, 0x66,
+ 0x66, 0x65, 0x63, 0x74, 0x69, 0x76, 0x65, 0x43, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x64, 0x12,
+ 0x45, 0x0a, 0x13, 0x69, 0x6d, 0x6d, 0x65, 0x64, 0x69, 0x61, 0x74, 0x65, 0x5f, 0x63, 0x61, 0x6c,
+ 0x6c, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x71,
+ 0x75, 0x65, 0x72, 0x79, 0x2e, 0x56, 0x54, 0x47, 0x61, 0x74, 0x65, 0x43, 0x61, 0x6c, 0x6c, 0x65,
+ 0x72, 0x49, 0x44, 0x52, 0x11, 0x69, 0x6d, 0x6d, 0x65, 0x64, 0x69, 0x61, 0x74, 0x65, 0x43, 0x61,
+ 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x64, 0x12, 0x25, 0x0a, 0x06, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74,
+ 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x54,
+ 0x61, 0x72, 0x67, 0x65, 0x74, 0x52, 0x06, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x12, 0x25, 0x0a,
+ 0x0e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x18,
+ 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0d, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69,
+ 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x64, 0x74, 0x69, 0x64, 0x18, 0x05, 0x20, 0x01,
+ 0x28, 0x09, 0x52, 0x04, 0x64, 0x74, 0x69, 0x64, 0x22, 0x44, 0x0a, 0x13, 0x53, 0x74, 0x61, 0x72,
+ 0x74, 0x43, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12,
+ 0x2d, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x17,
+ 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x53, 0x74, 0x61, 0x72, 0x74, 0x43, 0x6f, 0x6d, 0x6d,
+ 0x69, 0x74, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, 0x22, 0xfe,
+ 0x01, 0x0a, 0x12, 0x53, 0x65, 0x74, 0x52, 0x6f, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x52, 0x65,
+ 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x3f, 0x0a, 0x13, 0x65, 0x66, 0x66, 0x65, 0x63, 0x74, 0x69,
+ 0x76, 0x65, 0x5f, 0x63, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01,
+ 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x76, 0x74, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x61, 0x6c, 0x6c, 0x65,
+ 0x72, 0x49, 0x44, 0x52, 0x11, 0x65, 0x66, 0x66, 0x65, 0x63, 0x74, 0x69, 0x76, 0x65, 0x43, 0x61,
+ 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x64, 0x12, 0x45, 0x0a, 0x13, 0x69, 0x6d, 0x6d, 0x65, 0x64, 0x69,
+ 0x61, 0x74, 0x65, 0x5f, 0x63, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20,
+ 0x01, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x56, 0x54, 0x47, 0x61,
+ 0x74, 0x65, 0x43, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x44, 0x52, 0x11, 0x69, 0x6d, 0x6d, 0x65,
+ 0x64, 0x69, 0x61, 0x74, 0x65, 0x43, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x64, 0x12, 0x25, 0x0a,
+ 0x06, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e,
+ 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x54, 0x61, 0x72, 0x67, 0x65, 0x74, 0x52, 0x06, 0x74, 0x61,
+ 0x72, 0x67, 0x65, 0x74, 0x12, 0x25, 0x0a, 0x0e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74,
+ 0x69, 0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0d, 0x74, 0x72,
+ 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x64,
+ 0x74, 0x69, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x64, 0x74, 0x69, 0x64, 0x22,
+ 0x15, 0x0a, 0x13, 0x53, 0x65, 0x74, 0x52, 0x6f, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x52, 0x65,
+ 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0xdf, 0x01, 0x0a, 0x1a, 0x43, 0x6f, 0x6e, 0x63, 0x6c,
+ 0x75, 0x64, 0x65, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65,
0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x3f, 0x0a, 0x13, 0x65, 0x66, 0x66, 0x65, 0x63, 0x74, 0x69,
0x76, 0x65, 0x5f, 0x63, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01,
0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x76, 0x74, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x61, 0x6c, 0x6c, 0x65,
@@ -6274,130 +6284,30 @@ var file_query_proto_rawDesc = []byte{
0x06, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e,
0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x54, 0x61, 0x72, 0x67, 0x65, 0x74, 0x52, 0x06, 0x74, 0x61,
0x72, 0x67, 0x65, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x64, 0x74, 0x69, 0x64, 0x18, 0x04, 0x20, 0x01,
- 0x28, 0x09, 0x52, 0x04, 0x64, 0x74, 0x69, 0x64, 0x22, 0x51, 0x0a, 0x17, 0x52, 0x65, 0x61, 0x64,
- 0x54, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f,
- 0x6e, 0x73, 0x65, 0x12, 0x36, 0x0a, 0x08, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x18,
- 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x54, 0x72,
- 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74,
- 0x61, 0x52, 0x08, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x22, 0xef, 0x01, 0x0a, 0x1d,
- 0x55, 0x6e, 0x72, 0x65, 0x73, 0x6f, 0x6c, 0x76, 0x65, 0x64, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x61,
- 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x3f, 0x0a,
- 0x13, 0x65, 0x66, 0x66, 0x65, 0x63, 0x74, 0x69, 0x76, 0x65, 0x5f, 0x63, 0x61, 0x6c, 0x6c, 0x65,
- 0x72, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x76, 0x74, 0x72,
- 0x70, 0x63, 0x2e, 0x43, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x44, 0x52, 0x11, 0x65, 0x66, 0x66,
- 0x65, 0x63, 0x74, 0x69, 0x76, 0x65, 0x43, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x64, 0x12, 0x45,
- 0x0a, 0x13, 0x69, 0x6d, 0x6d, 0x65, 0x64, 0x69, 0x61, 0x74, 0x65, 0x5f, 0x63, 0x61, 0x6c, 0x6c,
- 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x71, 0x75,
- 0x65, 0x72, 0x79, 0x2e, 0x56, 0x54, 0x47, 0x61, 0x74, 0x65, 0x43, 0x61, 0x6c, 0x6c, 0x65, 0x72,
- 0x49, 0x44, 0x52, 0x11, 0x69, 0x6d, 0x6d, 0x65, 0x64, 0x69, 0x61, 0x74, 0x65, 0x43, 0x61, 0x6c,
- 0x6c, 0x65, 0x72, 0x49, 0x64, 0x12, 0x25, 0x0a, 0x06, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x18,
- 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x54, 0x61,
- 0x72, 0x67, 0x65, 0x74, 0x52, 0x06, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x12, 0x1f, 0x0a, 0x0b,
- 0x61, 0x62, 0x61, 0x6e, 0x64, 0x6f, 0x6e, 0x5f, 0x61, 0x67, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28,
- 0x03, 0x52, 0x0a, 0x61, 0x62, 0x61, 0x6e, 0x64, 0x6f, 0x6e, 0x41, 0x67, 0x65, 0x22, 0x60, 0x0a,
- 0x1e, 0x55, 0x6e, 0x72, 0x65, 0x73, 0x6f, 0x6c, 0x76, 0x65, 0x64, 0x54, 0x72, 0x61, 0x6e, 0x73,
- 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12,
- 0x3e, 0x0a, 0x0c, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18,
- 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x54, 0x72,
- 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74,
- 0x61, 0x52, 0x0c, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22,
- 0xe0, 0x02, 0x0a, 0x13, 0x42, 0x65, 0x67, 0x69, 0x6e, 0x45, 0x78, 0x65, 0x63, 0x75, 0x74, 0x65,
- 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x3f, 0x0a, 0x13, 0x65, 0x66, 0x66, 0x65, 0x63,
- 0x74, 0x69, 0x76, 0x65, 0x5f, 0x63, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x01,
- 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x76, 0x74, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x61, 0x6c,
- 0x6c, 0x65, 0x72, 0x49, 0x44, 0x52, 0x11, 0x65, 0x66, 0x66, 0x65, 0x63, 0x74, 0x69, 0x76, 0x65,
- 0x43, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x64, 0x12, 0x45, 0x0a, 0x13, 0x69, 0x6d, 0x6d, 0x65,
- 0x64, 0x69, 0x61, 0x74, 0x65, 0x5f, 0x63, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18,
- 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x56, 0x54,
- 0x47, 0x61, 0x74, 0x65, 0x43, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x44, 0x52, 0x11, 0x69, 0x6d,
- 0x6d, 0x65, 0x64, 0x69, 0x61, 0x74, 0x65, 0x43, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x64, 0x12,
- 0x25, 0x0a, 0x06, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32,
- 0x0d, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x54, 0x61, 0x72, 0x67, 0x65, 0x74, 0x52, 0x06,
- 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x12, 0x27, 0x0a, 0x05, 0x71, 0x75, 0x65, 0x72, 0x79, 0x18,
- 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x42, 0x6f,
- 0x75, 0x6e, 0x64, 0x51, 0x75, 0x65, 0x72, 0x79, 0x52, 0x05, 0x71, 0x75, 0x65, 0x72, 0x79, 0x12,
- 0x2f, 0x0a, 0x07, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b,
- 0x32, 0x15, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x45, 0x78, 0x65, 0x63, 0x75, 0x74, 0x65,
- 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x07, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73,
- 0x12, 0x1f, 0x0a, 0x0b, 0x72, 0x65, 0x73, 0x65, 0x72, 0x76, 0x65, 0x64, 0x5f, 0x69, 0x64, 0x18,
- 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x72, 0x65, 0x73, 0x65, 0x72, 0x76, 0x65, 0x64, 0x49,
- 0x64, 0x12, 0x1f, 0x0a, 0x0b, 0x70, 0x72, 0x65, 0x5f, 0x71, 0x75, 0x65, 0x72, 0x69, 0x65, 0x73,
- 0x18, 0x07, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0a, 0x70, 0x72, 0x65, 0x51, 0x75, 0x65, 0x72, 0x69,
- 0x65, 0x73, 0x22, 0xfe, 0x01, 0x0a, 0x14, 0x42, 0x65, 0x67, 0x69, 0x6e, 0x45, 0x78, 0x65, 0x63,
- 0x75, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x25, 0x0a, 0x05, 0x65,
- 0x72, 0x72, 0x6f, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x76, 0x74, 0x72,
- 0x70, 0x63, 0x2e, 0x52, 0x50, 0x43, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x52, 0x05, 0x65, 0x72, 0x72,
- 0x6f, 0x72, 0x12, 0x2a, 0x0a, 0x06, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x18, 0x02, 0x20, 0x01,
- 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79,
- 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x52, 0x06, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x12, 0x25,
- 0x0a, 0x0e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x69, 0x64,
- 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0d, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74,
- 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x38, 0x0a, 0x0c, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x5f,
- 0x61, 0x6c, 0x69, 0x61, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x74, 0x6f,
- 0x70, 0x6f, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x41, 0x6c, 0x69,
- 0x61, 0x73, 0x52, 0x0b, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x41, 0x6c, 0x69, 0x61, 0x73, 0x12,
- 0x32, 0x0a, 0x15, 0x73, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x5f, 0x73, 0x74, 0x61, 0x74, 0x65,
- 0x5f, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x13,
- 0x73, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x53, 0x74, 0x61, 0x74, 0x65, 0x43, 0x68, 0x61, 0x6e,
- 0x67, 0x65, 0x73, 0x22, 0xe6, 0x02, 0x0a, 0x19, 0x42, 0x65, 0x67, 0x69, 0x6e, 0x53, 0x74, 0x72,
- 0x65, 0x61, 0x6d, 0x45, 0x78, 0x65, 0x63, 0x75, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
- 0x74, 0x12, 0x3f, 0x0a, 0x13, 0x65, 0x66, 0x66, 0x65, 0x63, 0x74, 0x69, 0x76, 0x65, 0x5f, 0x63,
- 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f,
- 0x2e, 0x76, 0x74, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x44, 0x52,
- 0x11, 0x65, 0x66, 0x66, 0x65, 0x63, 0x74, 0x69, 0x76, 0x65, 0x43, 0x61, 0x6c, 0x6c, 0x65, 0x72,
- 0x49, 0x64, 0x12, 0x45, 0x0a, 0x13, 0x69, 0x6d, 0x6d, 0x65, 0x64, 0x69, 0x61, 0x74, 0x65, 0x5f,
- 0x63, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32,
- 0x15, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x56, 0x54, 0x47, 0x61, 0x74, 0x65, 0x43, 0x61,
- 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x44, 0x52, 0x11, 0x69, 0x6d, 0x6d, 0x65, 0x64, 0x69, 0x61, 0x74,
- 0x65, 0x43, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x64, 0x12, 0x25, 0x0a, 0x06, 0x74, 0x61, 0x72,
- 0x67, 0x65, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x71, 0x75, 0x65, 0x72,
- 0x79, 0x2e, 0x54, 0x61, 0x72, 0x67, 0x65, 0x74, 0x52, 0x06, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74,
- 0x12, 0x27, 0x0a, 0x05, 0x71, 0x75, 0x65, 0x72, 0x79, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32,
- 0x11, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x42, 0x6f, 0x75, 0x6e, 0x64, 0x51, 0x75, 0x65,
- 0x72, 0x79, 0x52, 0x05, 0x71, 0x75, 0x65, 0x72, 0x79, 0x12, 0x2f, 0x0a, 0x07, 0x6f, 0x70, 0x74,
- 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x71, 0x75, 0x65,
- 0x72, 0x79, 0x2e, 0x45, 0x78, 0x65, 0x63, 0x75, 0x74, 0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e,
- 0x73, 0x52, 0x07, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x1f, 0x0a, 0x0b, 0x70, 0x72,
- 0x65, 0x5f, 0x71, 0x75, 0x65, 0x72, 0x69, 0x65, 0x73, 0x18, 0x06, 0x20, 0x03, 0x28, 0x09, 0x52,
- 0x0a, 0x70, 0x72, 0x65, 0x51, 0x75, 0x65, 0x72, 0x69, 0x65, 0x73, 0x12, 0x1f, 0x0a, 0x0b, 0x72,
- 0x65, 0x73, 0x65, 0x72, 0x76, 0x65, 0x64, 0x5f, 0x69, 0x64, 0x18, 0x07, 0x20, 0x01, 0x28, 0x03,
- 0x52, 0x0a, 0x72, 0x65, 0x73, 0x65, 0x72, 0x76, 0x65, 0x64, 0x49, 0x64, 0x22, 0x84, 0x02, 0x0a,
- 0x1a, 0x42, 0x65, 0x67, 0x69, 0x6e, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x45, 0x78, 0x65, 0x63,
- 0x75, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x25, 0x0a, 0x05, 0x65,
- 0x72, 0x72, 0x6f, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x76, 0x74, 0x72,
- 0x70, 0x63, 0x2e, 0x52, 0x50, 0x43, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x52, 0x05, 0x65, 0x72, 0x72,
- 0x6f, 0x72, 0x12, 0x2a, 0x0a, 0x06, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x18, 0x02, 0x20, 0x01,
- 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79,
- 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x52, 0x06, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x12, 0x25,
- 0x0a, 0x0e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x69, 0x64,
- 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0d, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74,
- 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x38, 0x0a, 0x0c, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x5f,
- 0x61, 0x6c, 0x69, 0x61, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x74, 0x6f,
- 0x70, 0x6f, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x41, 0x6c, 0x69,
- 0x61, 0x73, 0x52, 0x0b, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x41, 0x6c, 0x69, 0x61, 0x73, 0x12,
- 0x32, 0x0a, 0x15, 0x73, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x5f, 0x73, 0x74, 0x61, 0x74, 0x65,
- 0x5f, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x13,
- 0x73, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x53, 0x74, 0x61, 0x74, 0x65, 0x43, 0x68, 0x61, 0x6e,
- 0x67, 0x65, 0x73, 0x22, 0xd9, 0x01, 0x0a, 0x14, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x53,
- 0x74, 0x72, 0x65, 0x61, 0x6d, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x3f, 0x0a, 0x13,
- 0x65, 0x66, 0x66, 0x65, 0x63, 0x74, 0x69, 0x76, 0x65, 0x5f, 0x63, 0x61, 0x6c, 0x6c, 0x65, 0x72,
- 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x76, 0x74, 0x72, 0x70,
- 0x63, 0x2e, 0x43, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x44, 0x52, 0x11, 0x65, 0x66, 0x66, 0x65,
- 0x63, 0x74, 0x69, 0x76, 0x65, 0x43, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x64, 0x12, 0x45, 0x0a,
- 0x13, 0x69, 0x6d, 0x6d, 0x65, 0x64, 0x69, 0x61, 0x74, 0x65, 0x5f, 0x63, 0x61, 0x6c, 0x6c, 0x65,
- 0x72, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x71, 0x75, 0x65,
- 0x72, 0x79, 0x2e, 0x56, 0x54, 0x47, 0x61, 0x74, 0x65, 0x43, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x49,
- 0x44, 0x52, 0x11, 0x69, 0x6d, 0x6d, 0x65, 0x64, 0x69, 0x61, 0x74, 0x65, 0x43, 0x61, 0x6c, 0x6c,
- 0x65, 0x72, 0x49, 0x64, 0x12, 0x25, 0x0a, 0x06, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x18, 0x03,
- 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x54, 0x61, 0x72,
- 0x67, 0x65, 0x74, 0x52, 0x06, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x6e,
- 0x61, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x22,
- 0x43, 0x0a, 0x15, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d,
- 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x2a, 0x0a, 0x06, 0x72, 0x65, 0x73, 0x75,
- 0x6c, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79,
- 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x52, 0x06, 0x72, 0x65,
- 0x73, 0x75, 0x6c, 0x74, 0x22, 0xf6, 0x01, 0x0a, 0x11, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65,
- 0x41, 0x63, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x3f, 0x0a, 0x13, 0x65, 0x66,
+ 0x28, 0x09, 0x52, 0x04, 0x64, 0x74, 0x69, 0x64, 0x22, 0x1d, 0x0a, 0x1b, 0x43, 0x6f, 0x6e, 0x63,
+ 0x6c, 0x75, 0x64, 0x65, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52,
+ 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0xdb, 0x01, 0x0a, 0x16, 0x52, 0x65, 0x61, 0x64,
+ 0x54, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65,
+ 0x73, 0x74, 0x12, 0x3f, 0x0a, 0x13, 0x65, 0x66, 0x66, 0x65, 0x63, 0x74, 0x69, 0x76, 0x65, 0x5f,
+ 0x63, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32,
+ 0x0f, 0x2e, 0x76, 0x74, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x44,
+ 0x52, 0x11, 0x65, 0x66, 0x66, 0x65, 0x63, 0x74, 0x69, 0x76, 0x65, 0x43, 0x61, 0x6c, 0x6c, 0x65,
+ 0x72, 0x49, 0x64, 0x12, 0x45, 0x0a, 0x13, 0x69, 0x6d, 0x6d, 0x65, 0x64, 0x69, 0x61, 0x74, 0x65,
+ 0x5f, 0x63, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b,
+ 0x32, 0x15, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x56, 0x54, 0x47, 0x61, 0x74, 0x65, 0x43,
+ 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x44, 0x52, 0x11, 0x69, 0x6d, 0x6d, 0x65, 0x64, 0x69, 0x61,
+ 0x74, 0x65, 0x43, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x64, 0x12, 0x25, 0x0a, 0x06, 0x74, 0x61,
+ 0x72, 0x67, 0x65, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x71, 0x75, 0x65,
+ 0x72, 0x79, 0x2e, 0x54, 0x61, 0x72, 0x67, 0x65, 0x74, 0x52, 0x06, 0x74, 0x61, 0x72, 0x67, 0x65,
+ 0x74, 0x12, 0x12, 0x0a, 0x04, 0x64, 0x74, 0x69, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52,
+ 0x04, 0x64, 0x74, 0x69, 0x64, 0x22, 0x51, 0x0a, 0x17, 0x52, 0x65, 0x61, 0x64, 0x54, 0x72, 0x61,
+ 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
+ 0x12, 0x36, 0x0a, 0x08, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01,
+ 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x54, 0x72, 0x61, 0x6e, 0x73,
+ 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x52, 0x08,
+ 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x22, 0xef, 0x01, 0x0a, 0x1d, 0x55, 0x6e, 0x72,
+ 0x65, 0x73, 0x6f, 0x6c, 0x76, 0x65, 0x64, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69,
+ 0x6f, 0x6e, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x3f, 0x0a, 0x13, 0x65, 0x66,
0x66, 0x65, 0x63, 0x74, 0x69, 0x76, 0x65, 0x5f, 0x63, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x5f, 0x69,
0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x76, 0x74, 0x72, 0x70, 0x63, 0x2e,
0x43, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x44, 0x52, 0x11, 0x65, 0x66, 0x66, 0x65, 0x63, 0x74,
@@ -6408,16 +6318,94 @@ var file_query_proto_rawDesc = []byte{
0x11, 0x69, 0x6d, 0x6d, 0x65, 0x64, 0x69, 0x61, 0x74, 0x65, 0x43, 0x61, 0x6c, 0x6c, 0x65, 0x72,
0x49, 0x64, 0x12, 0x25, 0x0a, 0x06, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x18, 0x03, 0x20, 0x01,
0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x54, 0x61, 0x72, 0x67, 0x65,
- 0x74, 0x52, 0x06, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d,
- 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x1e, 0x0a,
- 0x03, 0x69, 0x64, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x71, 0x75, 0x65,
- 0x72, 0x79, 0x2e, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x03, 0x69, 0x64, 0x73, 0x22, 0x40, 0x0a,
- 0x12, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x41, 0x63, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f,
- 0x6e, 0x73, 0x65, 0x12, 0x2a, 0x0a, 0x06, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x18, 0x01, 0x20,
- 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x51, 0x75, 0x65, 0x72,
- 0x79, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x52, 0x06, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x22,
- 0xe8, 0x02, 0x0a, 0x15, 0x52, 0x65, 0x73, 0x65, 0x72, 0x76, 0x65, 0x45, 0x78, 0x65, 0x63, 0x75,
- 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x3f, 0x0a, 0x13, 0x65, 0x66, 0x66,
+ 0x74, 0x52, 0x06, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x12, 0x1f, 0x0a, 0x0b, 0x61, 0x62, 0x61,
+ 0x6e, 0x64, 0x6f, 0x6e, 0x5f, 0x61, 0x67, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a,
+ 0x61, 0x62, 0x61, 0x6e, 0x64, 0x6f, 0x6e, 0x41, 0x67, 0x65, 0x22, 0x60, 0x0a, 0x1e, 0x55, 0x6e,
+ 0x72, 0x65, 0x73, 0x6f, 0x6c, 0x76, 0x65, 0x64, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74,
+ 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x3e, 0x0a, 0x0c,
+ 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x01, 0x20, 0x03,
+ 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x54, 0x72, 0x61, 0x6e, 0x73,
+ 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x52, 0x0c,
+ 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0xe0, 0x02, 0x0a,
+ 0x13, 0x42, 0x65, 0x67, 0x69, 0x6e, 0x45, 0x78, 0x65, 0x63, 0x75, 0x74, 0x65, 0x52, 0x65, 0x71,
+ 0x75, 0x65, 0x73, 0x74, 0x12, 0x3f, 0x0a, 0x13, 0x65, 0x66, 0x66, 0x65, 0x63, 0x74, 0x69, 0x76,
+ 0x65, 0x5f, 0x63, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
+ 0x0b, 0x32, 0x0f, 0x2e, 0x76, 0x74, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x61, 0x6c, 0x6c, 0x65, 0x72,
+ 0x49, 0x44, 0x52, 0x11, 0x65, 0x66, 0x66, 0x65, 0x63, 0x74, 0x69, 0x76, 0x65, 0x43, 0x61, 0x6c,
+ 0x6c, 0x65, 0x72, 0x49, 0x64, 0x12, 0x45, 0x0a, 0x13, 0x69, 0x6d, 0x6d, 0x65, 0x64, 0x69, 0x61,
+ 0x74, 0x65, 0x5f, 0x63, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01,
+ 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x56, 0x54, 0x47, 0x61, 0x74,
+ 0x65, 0x43, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x44, 0x52, 0x11, 0x69, 0x6d, 0x6d, 0x65, 0x64,
+ 0x69, 0x61, 0x74, 0x65, 0x43, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x64, 0x12, 0x25, 0x0a, 0x06,
+ 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x71,
+ 0x75, 0x65, 0x72, 0x79, 0x2e, 0x54, 0x61, 0x72, 0x67, 0x65, 0x74, 0x52, 0x06, 0x74, 0x61, 0x72,
+ 0x67, 0x65, 0x74, 0x12, 0x27, 0x0a, 0x05, 0x71, 0x75, 0x65, 0x72, 0x79, 0x18, 0x04, 0x20, 0x01,
+ 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x42, 0x6f, 0x75, 0x6e, 0x64,
+ 0x51, 0x75, 0x65, 0x72, 0x79, 0x52, 0x05, 0x71, 0x75, 0x65, 0x72, 0x79, 0x12, 0x2f, 0x0a, 0x07,
+ 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x15, 0x2e,
+ 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x45, 0x78, 0x65, 0x63, 0x75, 0x74, 0x65, 0x4f, 0x70, 0x74,
+ 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x07, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x1f, 0x0a,
+ 0x0b, 0x72, 0x65, 0x73, 0x65, 0x72, 0x76, 0x65, 0x64, 0x5f, 0x69, 0x64, 0x18, 0x06, 0x20, 0x01,
+ 0x28, 0x03, 0x52, 0x0a, 0x72, 0x65, 0x73, 0x65, 0x72, 0x76, 0x65, 0x64, 0x49, 0x64, 0x12, 0x1f,
+ 0x0a, 0x0b, 0x70, 0x72, 0x65, 0x5f, 0x71, 0x75, 0x65, 0x72, 0x69, 0x65, 0x73, 0x18, 0x07, 0x20,
+ 0x03, 0x28, 0x09, 0x52, 0x0a, 0x70, 0x72, 0x65, 0x51, 0x75, 0x65, 0x72, 0x69, 0x65, 0x73, 0x22,
+ 0xfe, 0x01, 0x0a, 0x14, 0x42, 0x65, 0x67, 0x69, 0x6e, 0x45, 0x78, 0x65, 0x63, 0x75, 0x74, 0x65,
+ 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x25, 0x0a, 0x05, 0x65, 0x72, 0x72, 0x6f,
+ 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x76, 0x74, 0x72, 0x70, 0x63, 0x2e,
+ 0x52, 0x50, 0x43, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x52, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x12,
+ 0x2a, 0x0a, 0x06, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32,
+ 0x12, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x52, 0x65, 0x73,
+ 0x75, 0x6c, 0x74, 0x52, 0x06, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x12, 0x25, 0x0a, 0x0e, 0x74,
+ 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x18, 0x03, 0x20,
+ 0x01, 0x28, 0x03, 0x52, 0x0d, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e,
+ 0x49, 0x64, 0x12, 0x38, 0x0a, 0x0c, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x5f, 0x61, 0x6c, 0x69,
+ 0x61, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x74, 0x6f, 0x70, 0x6f, 0x64,
+ 0x61, 0x74, 0x61, 0x2e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x41, 0x6c, 0x69, 0x61, 0x73, 0x52,
+ 0x0b, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x41, 0x6c, 0x69, 0x61, 0x73, 0x12, 0x32, 0x0a, 0x15,
+ 0x73, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x5f, 0x73, 0x74, 0x61, 0x74, 0x65, 0x5f, 0x63, 0x68,
+ 0x61, 0x6e, 0x67, 0x65, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x13, 0x73, 0x65, 0x73,
+ 0x73, 0x69, 0x6f, 0x6e, 0x53, 0x74, 0x61, 0x74, 0x65, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x73,
+ 0x22, 0xe6, 0x02, 0x0a, 0x19, 0x42, 0x65, 0x67, 0x69, 0x6e, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d,
+ 0x45, 0x78, 0x65, 0x63, 0x75, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x3f,
+ 0x0a, 0x13, 0x65, 0x66, 0x66, 0x65, 0x63, 0x74, 0x69, 0x76, 0x65, 0x5f, 0x63, 0x61, 0x6c, 0x6c,
+ 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x76, 0x74,
+ 0x72, 0x70, 0x63, 0x2e, 0x43, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x44, 0x52, 0x11, 0x65, 0x66,
+ 0x66, 0x65, 0x63, 0x74, 0x69, 0x76, 0x65, 0x43, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x64, 0x12,
+ 0x45, 0x0a, 0x13, 0x69, 0x6d, 0x6d, 0x65, 0x64, 0x69, 0x61, 0x74, 0x65, 0x5f, 0x63, 0x61, 0x6c,
+ 0x6c, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x71,
+ 0x75, 0x65, 0x72, 0x79, 0x2e, 0x56, 0x54, 0x47, 0x61, 0x74, 0x65, 0x43, 0x61, 0x6c, 0x6c, 0x65,
+ 0x72, 0x49, 0x44, 0x52, 0x11, 0x69, 0x6d, 0x6d, 0x65, 0x64, 0x69, 0x61, 0x74, 0x65, 0x43, 0x61,
+ 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x64, 0x12, 0x25, 0x0a, 0x06, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74,
+ 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x54,
+ 0x61, 0x72, 0x67, 0x65, 0x74, 0x52, 0x06, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x12, 0x27, 0x0a,
+ 0x05, 0x71, 0x75, 0x65, 0x72, 0x79, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x71,
+ 0x75, 0x65, 0x72, 0x79, 0x2e, 0x42, 0x6f, 0x75, 0x6e, 0x64, 0x51, 0x75, 0x65, 0x72, 0x79, 0x52,
+ 0x05, 0x71, 0x75, 0x65, 0x72, 0x79, 0x12, 0x2f, 0x0a, 0x07, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e,
+ 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e,
+ 0x45, 0x78, 0x65, 0x63, 0x75, 0x74, 0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x07,
+ 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x1f, 0x0a, 0x0b, 0x70, 0x72, 0x65, 0x5f, 0x71,
+ 0x75, 0x65, 0x72, 0x69, 0x65, 0x73, 0x18, 0x06, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0a, 0x70, 0x72,
+ 0x65, 0x51, 0x75, 0x65, 0x72, 0x69, 0x65, 0x73, 0x12, 0x1f, 0x0a, 0x0b, 0x72, 0x65, 0x73, 0x65,
+ 0x72, 0x76, 0x65, 0x64, 0x5f, 0x69, 0x64, 0x18, 0x07, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x72,
+ 0x65, 0x73, 0x65, 0x72, 0x76, 0x65, 0x64, 0x49, 0x64, 0x22, 0x84, 0x02, 0x0a, 0x1a, 0x42, 0x65,
+ 0x67, 0x69, 0x6e, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x45, 0x78, 0x65, 0x63, 0x75, 0x74, 0x65,
+ 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x25, 0x0a, 0x05, 0x65, 0x72, 0x72, 0x6f,
+ 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x76, 0x74, 0x72, 0x70, 0x63, 0x2e,
+ 0x52, 0x50, 0x43, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x52, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x12,
+ 0x2a, 0x0a, 0x06, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32,
+ 0x12, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x52, 0x65, 0x73,
+ 0x75, 0x6c, 0x74, 0x52, 0x06, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x12, 0x25, 0x0a, 0x0e, 0x74,
+ 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x18, 0x03, 0x20,
+ 0x01, 0x28, 0x03, 0x52, 0x0d, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e,
+ 0x49, 0x64, 0x12, 0x38, 0x0a, 0x0c, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x5f, 0x61, 0x6c, 0x69,
+ 0x61, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x74, 0x6f, 0x70, 0x6f, 0x64,
+ 0x61, 0x74, 0x61, 0x2e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x41, 0x6c, 0x69, 0x61, 0x73, 0x52,
+ 0x0b, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x41, 0x6c, 0x69, 0x61, 0x73, 0x12, 0x32, 0x0a, 0x15,
+ 0x73, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x5f, 0x73, 0x74, 0x61, 0x74, 0x65, 0x5f, 0x63, 0x68,
+ 0x61, 0x6e, 0x67, 0x65, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x13, 0x73, 0x65, 0x73,
+ 0x73, 0x69, 0x6f, 0x6e, 0x53, 0x74, 0x61, 0x74, 0x65, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x73,
+ 0x22, 0xd9, 0x01, 0x0a, 0x14, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x53, 0x74, 0x72, 0x65,
+ 0x61, 0x6d, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x3f, 0x0a, 0x13, 0x65, 0x66, 0x66,
0x65, 0x63, 0x74, 0x69, 0x76, 0x65, 0x5f, 0x63, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x5f, 0x69, 0x64,
0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x76, 0x74, 0x72, 0x70, 0x63, 0x2e, 0x43,
0x61, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x44, 0x52, 0x11, 0x65, 0x66, 0x66, 0x65, 0x63, 0x74, 0x69,
@@ -6428,349 +6416,387 @@ var file_query_proto_rawDesc = []byte{
0x69, 0x6d, 0x6d, 0x65, 0x64, 0x69, 0x61, 0x74, 0x65, 0x43, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x49,
0x64, 0x12, 0x25, 0x0a, 0x06, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28,
0x0b, 0x32, 0x0d, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x54, 0x61, 0x72, 0x67, 0x65, 0x74,
- 0x52, 0x06, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x12, 0x27, 0x0a, 0x05, 0x71, 0x75, 0x65, 0x72,
- 0x79, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e,
- 0x42, 0x6f, 0x75, 0x6e, 0x64, 0x51, 0x75, 0x65, 0x72, 0x79, 0x52, 0x05, 0x71, 0x75, 0x65, 0x72,
- 0x79, 0x12, 0x25, 0x0a, 0x0e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e,
- 0x5f, 0x69, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0d, 0x74, 0x72, 0x61, 0x6e, 0x73,
- 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x2f, 0x0a, 0x07, 0x6f, 0x70, 0x74, 0x69,
- 0x6f, 0x6e, 0x73, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x71, 0x75, 0x65, 0x72,
+ 0x52, 0x06, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65,
+ 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x43, 0x0a, 0x15,
+ 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x52, 0x65, 0x73,
+ 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x2a, 0x0a, 0x06, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x18,
+ 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x51, 0x75,
+ 0x65, 0x72, 0x79, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x52, 0x06, 0x72, 0x65, 0x73, 0x75, 0x6c,
+ 0x74, 0x22, 0xf6, 0x01, 0x0a, 0x11, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x41, 0x63, 0x6b,
+ 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x3f, 0x0a, 0x13, 0x65, 0x66, 0x66, 0x65, 0x63,
+ 0x74, 0x69, 0x76, 0x65, 0x5f, 0x63, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x01,
+ 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x76, 0x74, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x61, 0x6c,
+ 0x6c, 0x65, 0x72, 0x49, 0x44, 0x52, 0x11, 0x65, 0x66, 0x66, 0x65, 0x63, 0x74, 0x69, 0x76, 0x65,
+ 0x43, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x64, 0x12, 0x45, 0x0a, 0x13, 0x69, 0x6d, 0x6d, 0x65,
+ 0x64, 0x69, 0x61, 0x74, 0x65, 0x5f, 0x63, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18,
+ 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x56, 0x54,
+ 0x47, 0x61, 0x74, 0x65, 0x43, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x44, 0x52, 0x11, 0x69, 0x6d,
+ 0x6d, 0x65, 0x64, 0x69, 0x61, 0x74, 0x65, 0x43, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x64, 0x12,
+ 0x25, 0x0a, 0x06, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32,
+ 0x0d, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x54, 0x61, 0x72, 0x67, 0x65, 0x74, 0x52, 0x06,
+ 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x04,
+ 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x1e, 0x0a, 0x03, 0x69, 0x64,
+ 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e,
+ 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x03, 0x69, 0x64, 0x73, 0x22, 0x40, 0x0a, 0x12, 0x4d, 0x65,
+ 0x73, 0x73, 0x61, 0x67, 0x65, 0x41, 0x63, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
+ 0x12, 0x2a, 0x0a, 0x06, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b,
+ 0x32, 0x12, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x52, 0x65,
+ 0x73, 0x75, 0x6c, 0x74, 0x52, 0x06, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x22, 0xe8, 0x02, 0x0a,
+ 0x15, 0x52, 0x65, 0x73, 0x65, 0x72, 0x76, 0x65, 0x45, 0x78, 0x65, 0x63, 0x75, 0x74, 0x65, 0x52,
+ 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x3f, 0x0a, 0x13, 0x65, 0x66, 0x66, 0x65, 0x63, 0x74,
+ 0x69, 0x76, 0x65, 0x5f, 0x63, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20,
+ 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x76, 0x74, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x61, 0x6c, 0x6c,
+ 0x65, 0x72, 0x49, 0x44, 0x52, 0x11, 0x65, 0x66, 0x66, 0x65, 0x63, 0x74, 0x69, 0x76, 0x65, 0x43,
+ 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x64, 0x12, 0x45, 0x0a, 0x13, 0x69, 0x6d, 0x6d, 0x65, 0x64,
+ 0x69, 0x61, 0x74, 0x65, 0x5f, 0x63, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x02,
+ 0x20, 0x01, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x56, 0x54, 0x47,
+ 0x61, 0x74, 0x65, 0x43, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x44, 0x52, 0x11, 0x69, 0x6d, 0x6d,
+ 0x65, 0x64, 0x69, 0x61, 0x74, 0x65, 0x43, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x64, 0x12, 0x25,
+ 0x0a, 0x06, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d,
+ 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x54, 0x61, 0x72, 0x67, 0x65, 0x74, 0x52, 0x06, 0x74,
+ 0x61, 0x72, 0x67, 0x65, 0x74, 0x12, 0x27, 0x0a, 0x05, 0x71, 0x75, 0x65, 0x72, 0x79, 0x18, 0x04,
+ 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x42, 0x6f, 0x75,
+ 0x6e, 0x64, 0x51, 0x75, 0x65, 0x72, 0x79, 0x52, 0x05, 0x71, 0x75, 0x65, 0x72, 0x79, 0x12, 0x25,
+ 0x0a, 0x0e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x69, 0x64,
+ 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0d, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74,
+ 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x2f, 0x0a, 0x07, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73,
+ 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x45,
+ 0x78, 0x65, 0x63, 0x75, 0x74, 0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x07, 0x6f,
+ 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x1f, 0x0a, 0x0b, 0x70, 0x72, 0x65, 0x5f, 0x71, 0x75,
+ 0x65, 0x72, 0x69, 0x65, 0x73, 0x18, 0x07, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0a, 0x70, 0x72, 0x65,
+ 0x51, 0x75, 0x65, 0x72, 0x69, 0x65, 0x73, 0x22, 0xc6, 0x01, 0x0a, 0x16, 0x52, 0x65, 0x73, 0x65,
+ 0x72, 0x76, 0x65, 0x45, 0x78, 0x65, 0x63, 0x75, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
+ 0x73, 0x65, 0x12, 0x25, 0x0a, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28,
+ 0x0b, 0x32, 0x0f, 0x2e, 0x76, 0x74, 0x72, 0x70, 0x63, 0x2e, 0x52, 0x50, 0x43, 0x45, 0x72, 0x72,
+ 0x6f, 0x72, 0x52, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x12, 0x2a, 0x0a, 0x06, 0x72, 0x65, 0x73,
+ 0x75, 0x6c, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x71, 0x75, 0x65, 0x72,
+ 0x79, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x52, 0x06, 0x72,
+ 0x65, 0x73, 0x75, 0x6c, 0x74, 0x12, 0x1f, 0x0a, 0x0b, 0x72, 0x65, 0x73, 0x65, 0x72, 0x76, 0x65,
+ 0x64, 0x5f, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x72, 0x65, 0x73, 0x65,
+ 0x72, 0x76, 0x65, 0x64, 0x49, 0x64, 0x12, 0x38, 0x0a, 0x0c, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74,
+ 0x5f, 0x61, 0x6c, 0x69, 0x61, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x74,
+ 0x6f, 0x70, 0x6f, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x41, 0x6c,
+ 0x69, 0x61, 0x73, 0x52, 0x0b, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x41, 0x6c, 0x69, 0x61, 0x73,
+ 0x22, 0xee, 0x02, 0x0a, 0x1b, 0x52, 0x65, 0x73, 0x65, 0x72, 0x76, 0x65, 0x53, 0x74, 0x72, 0x65,
+ 0x61, 0x6d, 0x45, 0x78, 0x65, 0x63, 0x75, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
+ 0x12, 0x3f, 0x0a, 0x13, 0x65, 0x66, 0x66, 0x65, 0x63, 0x74, 0x69, 0x76, 0x65, 0x5f, 0x63, 0x61,
+ 0x6c, 0x6c, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e,
+ 0x76, 0x74, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x44, 0x52, 0x11,
+ 0x65, 0x66, 0x66, 0x65, 0x63, 0x74, 0x69, 0x76, 0x65, 0x43, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x49,
+ 0x64, 0x12, 0x45, 0x0a, 0x13, 0x69, 0x6d, 0x6d, 0x65, 0x64, 0x69, 0x61, 0x74, 0x65, 0x5f, 0x63,
+ 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x15,
+ 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x56, 0x54, 0x47, 0x61, 0x74, 0x65, 0x43, 0x61, 0x6c,
+ 0x6c, 0x65, 0x72, 0x49, 0x44, 0x52, 0x11, 0x69, 0x6d, 0x6d, 0x65, 0x64, 0x69, 0x61, 0x74, 0x65,
+ 0x43, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x64, 0x12, 0x25, 0x0a, 0x06, 0x74, 0x61, 0x72, 0x67,
+ 0x65, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79,
+ 0x2e, 0x54, 0x61, 0x72, 0x67, 0x65, 0x74, 0x52, 0x06, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x12,
+ 0x27, 0x0a, 0x05, 0x71, 0x75, 0x65, 0x72, 0x79, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11,
+ 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x42, 0x6f, 0x75, 0x6e, 0x64, 0x51, 0x75, 0x65, 0x72,
+ 0x79, 0x52, 0x05, 0x71, 0x75, 0x65, 0x72, 0x79, 0x12, 0x2f, 0x0a, 0x07, 0x6f, 0x70, 0x74, 0x69,
+ 0x6f, 0x6e, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x71, 0x75, 0x65, 0x72,
0x79, 0x2e, 0x45, 0x78, 0x65, 0x63, 0x75, 0x74, 0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73,
- 0x52, 0x07, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x1f, 0x0a, 0x0b, 0x70, 0x72, 0x65,
- 0x5f, 0x71, 0x75, 0x65, 0x72, 0x69, 0x65, 0x73, 0x18, 0x07, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0a,
- 0x70, 0x72, 0x65, 0x51, 0x75, 0x65, 0x72, 0x69, 0x65, 0x73, 0x22, 0xc6, 0x01, 0x0a, 0x16, 0x52,
- 0x65, 0x73, 0x65, 0x72, 0x76, 0x65, 0x45, 0x78, 0x65, 0x63, 0x75, 0x74, 0x65, 0x52, 0x65, 0x73,
- 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x25, 0x0a, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x18, 0x01,
- 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x76, 0x74, 0x72, 0x70, 0x63, 0x2e, 0x52, 0x50, 0x43,
- 0x45, 0x72, 0x72, 0x6f, 0x72, 0x52, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x12, 0x2a, 0x0a, 0x06,
- 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x71,
- 0x75, 0x65, 0x72, 0x79, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74,
- 0x52, 0x06, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x12, 0x1f, 0x0a, 0x0b, 0x72, 0x65, 0x73, 0x65,
- 0x72, 0x76, 0x65, 0x64, 0x5f, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x72,
- 0x65, 0x73, 0x65, 0x72, 0x76, 0x65, 0x64, 0x49, 0x64, 0x12, 0x38, 0x0a, 0x0c, 0x74, 0x61, 0x62,
- 0x6c, 0x65, 0x74, 0x5f, 0x61, 0x6c, 0x69, 0x61, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32,
- 0x15, 0x2e, 0x74, 0x6f, 0x70, 0x6f, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x54, 0x61, 0x62, 0x6c, 0x65,
- 0x74, 0x41, 0x6c, 0x69, 0x61, 0x73, 0x52, 0x0b, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x41, 0x6c,
- 0x69, 0x61, 0x73, 0x22, 0xee, 0x02, 0x0a, 0x1b, 0x52, 0x65, 0x73, 0x65, 0x72, 0x76, 0x65, 0x53,
- 0x74, 0x72, 0x65, 0x61, 0x6d, 0x45, 0x78, 0x65, 0x63, 0x75, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75,
- 0x65, 0x73, 0x74, 0x12, 0x3f, 0x0a, 0x13, 0x65, 0x66, 0x66, 0x65, 0x63, 0x74, 0x69, 0x76, 0x65,
- 0x5f, 0x63, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b,
- 0x32, 0x0f, 0x2e, 0x76, 0x74, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x49,
- 0x44, 0x52, 0x11, 0x65, 0x66, 0x66, 0x65, 0x63, 0x74, 0x69, 0x76, 0x65, 0x43, 0x61, 0x6c, 0x6c,
- 0x65, 0x72, 0x49, 0x64, 0x12, 0x45, 0x0a, 0x13, 0x69, 0x6d, 0x6d, 0x65, 0x64, 0x69, 0x61, 0x74,
- 0x65, 0x5f, 0x63, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28,
- 0x0b, 0x32, 0x15, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x56, 0x54, 0x47, 0x61, 0x74, 0x65,
- 0x43, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x44, 0x52, 0x11, 0x69, 0x6d, 0x6d, 0x65, 0x64, 0x69,
- 0x61, 0x74, 0x65, 0x43, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x64, 0x12, 0x25, 0x0a, 0x06, 0x74,
- 0x61, 0x72, 0x67, 0x65, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x71, 0x75,
- 0x65, 0x72, 0x79, 0x2e, 0x54, 0x61, 0x72, 0x67, 0x65, 0x74, 0x52, 0x06, 0x74, 0x61, 0x72, 0x67,
- 0x65, 0x74, 0x12, 0x27, 0x0a, 0x05, 0x71, 0x75, 0x65, 0x72, 0x79, 0x18, 0x04, 0x20, 0x01, 0x28,
- 0x0b, 0x32, 0x11, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x42, 0x6f, 0x75, 0x6e, 0x64, 0x51,
- 0x75, 0x65, 0x72, 0x79, 0x52, 0x05, 0x71, 0x75, 0x65, 0x72, 0x79, 0x12, 0x2f, 0x0a, 0x07, 0x6f,
- 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x71,
- 0x75, 0x65, 0x72, 0x79, 0x2e, 0x45, 0x78, 0x65, 0x63, 0x75, 0x74, 0x65, 0x4f, 0x70, 0x74, 0x69,
- 0x6f, 0x6e, 0x73, 0x52, 0x07, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x25, 0x0a, 0x0e,
- 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x18, 0x06,
- 0x20, 0x01, 0x28, 0x03, 0x52, 0x0d, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f,
- 0x6e, 0x49, 0x64, 0x12, 0x1f, 0x0a, 0x0b, 0x70, 0x72, 0x65, 0x5f, 0x71, 0x75, 0x65, 0x72, 0x69,
- 0x65, 0x73, 0x18, 0x07, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0a, 0x70, 0x72, 0x65, 0x51, 0x75, 0x65,
- 0x72, 0x69, 0x65, 0x73, 0x22, 0xcc, 0x01, 0x0a, 0x1c, 0x52, 0x65, 0x73, 0x65, 0x72, 0x76, 0x65,
- 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x45, 0x78, 0x65, 0x63, 0x75, 0x74, 0x65, 0x52, 0x65, 0x73,
- 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x25, 0x0a, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x18, 0x01,
- 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x76, 0x74, 0x72, 0x70, 0x63, 0x2e, 0x52, 0x50, 0x43,
- 0x45, 0x72, 0x72, 0x6f, 0x72, 0x52, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x12, 0x2a, 0x0a, 0x06,
- 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x71,
- 0x75, 0x65, 0x72, 0x79, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74,
- 0x52, 0x06, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x12, 0x1f, 0x0a, 0x0b, 0x72, 0x65, 0x73, 0x65,
- 0x72, 0x76, 0x65, 0x64, 0x5f, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x72,
- 0x65, 0x73, 0x65, 0x72, 0x76, 0x65, 0x64, 0x49, 0x64, 0x12, 0x38, 0x0a, 0x0c, 0x74, 0x61, 0x62,
- 0x6c, 0x65, 0x74, 0x5f, 0x61, 0x6c, 0x69, 0x61, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32,
- 0x15, 0x2e, 0x74, 0x6f, 0x70, 0x6f, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x54, 0x61, 0x62, 0x6c, 0x65,
- 0x74, 0x41, 0x6c, 0x69, 0x61, 0x73, 0x52, 0x0b, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x41, 0x6c,
- 0x69, 0x61, 0x73, 0x22, 0xf4, 0x02, 0x0a, 0x1a, 0x52, 0x65, 0x73, 0x65, 0x72, 0x76, 0x65, 0x42,
- 0x65, 0x67, 0x69, 0x6e, 0x45, 0x78, 0x65, 0x63, 0x75, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65,
- 0x73, 0x74, 0x12, 0x3f, 0x0a, 0x13, 0x65, 0x66, 0x66, 0x65, 0x63, 0x74, 0x69, 0x76, 0x65, 0x5f,
- 0x63, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32,
- 0x0f, 0x2e, 0x76, 0x74, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x44,
- 0x52, 0x11, 0x65, 0x66, 0x66, 0x65, 0x63, 0x74, 0x69, 0x76, 0x65, 0x43, 0x61, 0x6c, 0x6c, 0x65,
- 0x72, 0x49, 0x64, 0x12, 0x45, 0x0a, 0x13, 0x69, 0x6d, 0x6d, 0x65, 0x64, 0x69, 0x61, 0x74, 0x65,
- 0x5f, 0x63, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b,
- 0x32, 0x15, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x56, 0x54, 0x47, 0x61, 0x74, 0x65, 0x43,
- 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x44, 0x52, 0x11, 0x69, 0x6d, 0x6d, 0x65, 0x64, 0x69, 0x61,
- 0x74, 0x65, 0x43, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x64, 0x12, 0x25, 0x0a, 0x06, 0x74, 0x61,
- 0x72, 0x67, 0x65, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x71, 0x75, 0x65,
- 0x72, 0x79, 0x2e, 0x54, 0x61, 0x72, 0x67, 0x65, 0x74, 0x52, 0x06, 0x74, 0x61, 0x72, 0x67, 0x65,
- 0x74, 0x12, 0x27, 0x0a, 0x05, 0x71, 0x75, 0x65, 0x72, 0x79, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b,
- 0x32, 0x11, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x42, 0x6f, 0x75, 0x6e, 0x64, 0x51, 0x75,
- 0x65, 0x72, 0x79, 0x52, 0x05, 0x71, 0x75, 0x65, 0x72, 0x79, 0x12, 0x2f, 0x0a, 0x07, 0x6f, 0x70,
- 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x71, 0x75,
- 0x65, 0x72, 0x79, 0x2e, 0x45, 0x78, 0x65, 0x63, 0x75, 0x74, 0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f,
- 0x6e, 0x73, 0x52, 0x07, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x1f, 0x0a, 0x0b, 0x70,
- 0x72, 0x65, 0x5f, 0x71, 0x75, 0x65, 0x72, 0x69, 0x65, 0x73, 0x18, 0x06, 0x20, 0x03, 0x28, 0x09,
- 0x52, 0x0a, 0x70, 0x72, 0x65, 0x51, 0x75, 0x65, 0x72, 0x69, 0x65, 0x73, 0x12, 0x2c, 0x0a, 0x12,
- 0x70, 0x6f, 0x73, 0x74, 0x5f, 0x62, 0x65, 0x67, 0x69, 0x6e, 0x5f, 0x71, 0x75, 0x65, 0x72, 0x69,
- 0x65, 0x73, 0x18, 0x07, 0x20, 0x03, 0x28, 0x09, 0x52, 0x10, 0x70, 0x6f, 0x73, 0x74, 0x42, 0x65,
- 0x67, 0x69, 0x6e, 0x51, 0x75, 0x65, 0x72, 0x69, 0x65, 0x73, 0x22, 0xa6, 0x02, 0x0a, 0x1b, 0x52,
- 0x65, 0x73, 0x65, 0x72, 0x76, 0x65, 0x42, 0x65, 0x67, 0x69, 0x6e, 0x45, 0x78, 0x65, 0x63, 0x75,
- 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x25, 0x0a, 0x05, 0x65, 0x72,
- 0x72, 0x6f, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x76, 0x74, 0x72, 0x70,
- 0x63, 0x2e, 0x52, 0x50, 0x43, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x52, 0x05, 0x65, 0x72, 0x72, 0x6f,
- 0x72, 0x12, 0x2a, 0x0a, 0x06, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28,
- 0x0b, 0x32, 0x12, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x52,
- 0x65, 0x73, 0x75, 0x6c, 0x74, 0x52, 0x06, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x12, 0x25, 0x0a,
- 0x0e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x18,
- 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0d, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69,
- 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x1f, 0x0a, 0x0b, 0x72, 0x65, 0x73, 0x65, 0x72, 0x76, 0x65, 0x64,
- 0x5f, 0x69, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x72, 0x65, 0x73, 0x65, 0x72,
- 0x76, 0x65, 0x64, 0x49, 0x64, 0x12, 0x38, 0x0a, 0x0c, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x5f,
- 0x61, 0x6c, 0x69, 0x61, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x74, 0x6f,
- 0x70, 0x6f, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x41, 0x6c, 0x69,
- 0x61, 0x73, 0x52, 0x0b, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x41, 0x6c, 0x69, 0x61, 0x73, 0x12,
- 0x32, 0x0a, 0x15, 0x73, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x5f, 0x73, 0x74, 0x61, 0x74, 0x65,
- 0x5f, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x73, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x13,
- 0x73, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x53, 0x74, 0x61, 0x74, 0x65, 0x43, 0x68, 0x61, 0x6e,
- 0x67, 0x65, 0x73, 0x22, 0xfa, 0x02, 0x0a, 0x20, 0x52, 0x65, 0x73, 0x65, 0x72, 0x76, 0x65, 0x42,
- 0x65, 0x67, 0x69, 0x6e, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x45, 0x78, 0x65, 0x63, 0x75, 0x74,
- 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x3f, 0x0a, 0x13, 0x65, 0x66, 0x66, 0x65,
- 0x63, 0x74, 0x69, 0x76, 0x65, 0x5f, 0x63, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18,
- 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x76, 0x74, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x61,
- 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x44, 0x52, 0x11, 0x65, 0x66, 0x66, 0x65, 0x63, 0x74, 0x69, 0x76,
- 0x65, 0x43, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x64, 0x12, 0x45, 0x0a, 0x13, 0x69, 0x6d, 0x6d,
- 0x65, 0x64, 0x69, 0x61, 0x74, 0x65, 0x5f, 0x63, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x5f, 0x69, 0x64,
- 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x56,
- 0x54, 0x47, 0x61, 0x74, 0x65, 0x43, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x44, 0x52, 0x11, 0x69,
- 0x6d, 0x6d, 0x65, 0x64, 0x69, 0x61, 0x74, 0x65, 0x43, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x64,
- 0x12, 0x25, 0x0a, 0x06, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b,
- 0x32, 0x0d, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x54, 0x61, 0x72, 0x67, 0x65, 0x74, 0x52,
- 0x06, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x12, 0x27, 0x0a, 0x05, 0x71, 0x75, 0x65, 0x72, 0x79,
- 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x42,
- 0x6f, 0x75, 0x6e, 0x64, 0x51, 0x75, 0x65, 0x72, 0x79, 0x52, 0x05, 0x71, 0x75, 0x65, 0x72, 0x79,
- 0x12, 0x2f, 0x0a, 0x07, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28,
- 0x0b, 0x32, 0x15, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x45, 0x78, 0x65, 0x63, 0x75, 0x74,
- 0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x07, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e,
- 0x73, 0x12, 0x1f, 0x0a, 0x0b, 0x70, 0x72, 0x65, 0x5f, 0x71, 0x75, 0x65, 0x72, 0x69, 0x65, 0x73,
- 0x18, 0x06, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0a, 0x70, 0x72, 0x65, 0x51, 0x75, 0x65, 0x72, 0x69,
- 0x65, 0x73, 0x12, 0x2c, 0x0a, 0x12, 0x70, 0x6f, 0x73, 0x74, 0x5f, 0x62, 0x65, 0x67, 0x69, 0x6e,
- 0x5f, 0x71, 0x75, 0x65, 0x72, 0x69, 0x65, 0x73, 0x18, 0x07, 0x20, 0x03, 0x28, 0x09, 0x52, 0x10,
- 0x70, 0x6f, 0x73, 0x74, 0x42, 0x65, 0x67, 0x69, 0x6e, 0x51, 0x75, 0x65, 0x72, 0x69, 0x65, 0x73,
- 0x22, 0xac, 0x02, 0x0a, 0x21, 0x52, 0x65, 0x73, 0x65, 0x72, 0x76, 0x65, 0x42, 0x65, 0x67, 0x69,
- 0x6e, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x45, 0x78, 0x65, 0x63, 0x75, 0x74, 0x65, 0x52, 0x65,
- 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x25, 0x0a, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x18,
- 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x76, 0x74, 0x72, 0x70, 0x63, 0x2e, 0x52, 0x50,
- 0x43, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x52, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x12, 0x2a, 0x0a,
- 0x06, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e,
- 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x52, 0x65, 0x73, 0x75, 0x6c,
- 0x74, 0x52, 0x06, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x12, 0x25, 0x0a, 0x0e, 0x74, 0x72, 0x61,
- 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28,
+ 0x52, 0x07, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x25, 0x0a, 0x0e, 0x74, 0x72, 0x61,
+ 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x18, 0x06, 0x20, 0x01, 0x28,
0x03, 0x52, 0x0d, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64,
- 0x12, 0x1f, 0x0a, 0x0b, 0x72, 0x65, 0x73, 0x65, 0x72, 0x76, 0x65, 0x64, 0x5f, 0x69, 0x64, 0x18,
- 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x72, 0x65, 0x73, 0x65, 0x72, 0x76, 0x65, 0x64, 0x49,
- 0x64, 0x12, 0x38, 0x0a, 0x0c, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x5f, 0x61, 0x6c, 0x69, 0x61,
- 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x74, 0x6f, 0x70, 0x6f, 0x64, 0x61,
- 0x74, 0x61, 0x2e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x41, 0x6c, 0x69, 0x61, 0x73, 0x52, 0x0b,
- 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x41, 0x6c, 0x69, 0x61, 0x73, 0x12, 0x32, 0x0a, 0x15, 0x73,
- 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x5f, 0x73, 0x74, 0x61, 0x74, 0x65, 0x5f, 0x63, 0x68, 0x61,
- 0x6e, 0x67, 0x65, 0x73, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x13, 0x73, 0x65, 0x73, 0x73,
- 0x69, 0x6f, 0x6e, 0x53, 0x74, 0x61, 0x74, 0x65, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x73, 0x22,
- 0x87, 0x02, 0x0a, 0x0e, 0x52, 0x65, 0x6c, 0x65, 0x61, 0x73, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65,
- 0x73, 0x74, 0x12, 0x3f, 0x0a, 0x13, 0x65, 0x66, 0x66, 0x65, 0x63, 0x74, 0x69, 0x76, 0x65, 0x5f,
- 0x63, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32,
- 0x0f, 0x2e, 0x76, 0x74, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x44,
- 0x52, 0x11, 0x65, 0x66, 0x66, 0x65, 0x63, 0x74, 0x69, 0x76, 0x65, 0x43, 0x61, 0x6c, 0x6c, 0x65,
- 0x72, 0x49, 0x64, 0x12, 0x45, 0x0a, 0x13, 0x69, 0x6d, 0x6d, 0x65, 0x64, 0x69, 0x61, 0x74, 0x65,
- 0x5f, 0x63, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b,
- 0x32, 0x15, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x56, 0x54, 0x47, 0x61, 0x74, 0x65, 0x43,
- 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x44, 0x52, 0x11, 0x69, 0x6d, 0x6d, 0x65, 0x64, 0x69, 0x61,
- 0x74, 0x65, 0x43, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x64, 0x12, 0x25, 0x0a, 0x06, 0x74, 0x61,
- 0x72, 0x67, 0x65, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x71, 0x75, 0x65,
- 0x72, 0x79, 0x2e, 0x54, 0x61, 0x72, 0x67, 0x65, 0x74, 0x52, 0x06, 0x74, 0x61, 0x72, 0x67, 0x65,
- 0x74, 0x12, 0x25, 0x0a, 0x0e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e,
- 0x5f, 0x69, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0d, 0x74, 0x72, 0x61, 0x6e, 0x73,
- 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x1f, 0x0a, 0x0b, 0x72, 0x65, 0x73, 0x65,
- 0x72, 0x76, 0x65, 0x64, 0x5f, 0x69, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x72,
- 0x65, 0x73, 0x65, 0x72, 0x76, 0x65, 0x64, 0x49, 0x64, 0x22, 0x11, 0x0a, 0x0f, 0x52, 0x65, 0x6c,
- 0x65, 0x61, 0x73, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x15, 0x0a, 0x13,
- 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x48, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x52, 0x65, 0x71, 0x75,
- 0x65, 0x73, 0x74, 0x22, 0xbe, 0x03, 0x0a, 0x0d, 0x52, 0x65, 0x61, 0x6c, 0x74, 0x69, 0x6d, 0x65,
- 0x53, 0x74, 0x61, 0x74, 0x73, 0x12, 0x21, 0x0a, 0x0c, 0x68, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x5f,
- 0x65, 0x72, 0x72, 0x6f, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x68, 0x65, 0x61,
- 0x6c, 0x74, 0x68, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x12, 0x36, 0x0a, 0x17, 0x72, 0x65, 0x70, 0x6c,
+ 0x12, 0x1f, 0x0a, 0x0b, 0x70, 0x72, 0x65, 0x5f, 0x71, 0x75, 0x65, 0x72, 0x69, 0x65, 0x73, 0x18,
+ 0x07, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0a, 0x70, 0x72, 0x65, 0x51, 0x75, 0x65, 0x72, 0x69, 0x65,
+ 0x73, 0x22, 0xcc, 0x01, 0x0a, 0x1c, 0x52, 0x65, 0x73, 0x65, 0x72, 0x76, 0x65, 0x53, 0x74, 0x72,
+ 0x65, 0x61, 0x6d, 0x45, 0x78, 0x65, 0x63, 0x75, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
+ 0x73, 0x65, 0x12, 0x25, 0x0a, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28,
+ 0x0b, 0x32, 0x0f, 0x2e, 0x76, 0x74, 0x72, 0x70, 0x63, 0x2e, 0x52, 0x50, 0x43, 0x45, 0x72, 0x72,
+ 0x6f, 0x72, 0x52, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x12, 0x2a, 0x0a, 0x06, 0x72, 0x65, 0x73,
+ 0x75, 0x6c, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x71, 0x75, 0x65, 0x72,
+ 0x79, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x52, 0x06, 0x72,
+ 0x65, 0x73, 0x75, 0x6c, 0x74, 0x12, 0x1f, 0x0a, 0x0b, 0x72, 0x65, 0x73, 0x65, 0x72, 0x76, 0x65,
+ 0x64, 0x5f, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x72, 0x65, 0x73, 0x65,
+ 0x72, 0x76, 0x65, 0x64, 0x49, 0x64, 0x12, 0x38, 0x0a, 0x0c, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74,
+ 0x5f, 0x61, 0x6c, 0x69, 0x61, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x74,
+ 0x6f, 0x70, 0x6f, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x41, 0x6c,
+ 0x69, 0x61, 0x73, 0x52, 0x0b, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x41, 0x6c, 0x69, 0x61, 0x73,
+ 0x22, 0xf4, 0x02, 0x0a, 0x1a, 0x52, 0x65, 0x73, 0x65, 0x72, 0x76, 0x65, 0x42, 0x65, 0x67, 0x69,
+ 0x6e, 0x45, 0x78, 0x65, 0x63, 0x75, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12,
+ 0x3f, 0x0a, 0x13, 0x65, 0x66, 0x66, 0x65, 0x63, 0x74, 0x69, 0x76, 0x65, 0x5f, 0x63, 0x61, 0x6c,
+ 0x6c, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x76,
+ 0x74, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x44, 0x52, 0x11, 0x65,
+ 0x66, 0x66, 0x65, 0x63, 0x74, 0x69, 0x76, 0x65, 0x43, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x64,
+ 0x12, 0x45, 0x0a, 0x13, 0x69, 0x6d, 0x6d, 0x65, 0x64, 0x69, 0x61, 0x74, 0x65, 0x5f, 0x63, 0x61,
+ 0x6c, 0x6c, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x15, 0x2e,
+ 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x56, 0x54, 0x47, 0x61, 0x74, 0x65, 0x43, 0x61, 0x6c, 0x6c,
+ 0x65, 0x72, 0x49, 0x44, 0x52, 0x11, 0x69, 0x6d, 0x6d, 0x65, 0x64, 0x69, 0x61, 0x74, 0x65, 0x43,
+ 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x64, 0x12, 0x25, 0x0a, 0x06, 0x74, 0x61, 0x72, 0x67, 0x65,
+ 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e,
+ 0x54, 0x61, 0x72, 0x67, 0x65, 0x74, 0x52, 0x06, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x12, 0x27,
+ 0x0a, 0x05, 0x71, 0x75, 0x65, 0x72, 0x79, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e,
+ 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x42, 0x6f, 0x75, 0x6e, 0x64, 0x51, 0x75, 0x65, 0x72, 0x79,
+ 0x52, 0x05, 0x71, 0x75, 0x65, 0x72, 0x79, 0x12, 0x2f, 0x0a, 0x07, 0x6f, 0x70, 0x74, 0x69, 0x6f,
+ 0x6e, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79,
+ 0x2e, 0x45, 0x78, 0x65, 0x63, 0x75, 0x74, 0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52,
+ 0x07, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x1f, 0x0a, 0x0b, 0x70, 0x72, 0x65, 0x5f,
+ 0x71, 0x75, 0x65, 0x72, 0x69, 0x65, 0x73, 0x18, 0x06, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0a, 0x70,
+ 0x72, 0x65, 0x51, 0x75, 0x65, 0x72, 0x69, 0x65, 0x73, 0x12, 0x2c, 0x0a, 0x12, 0x70, 0x6f, 0x73,
+ 0x74, 0x5f, 0x62, 0x65, 0x67, 0x69, 0x6e, 0x5f, 0x71, 0x75, 0x65, 0x72, 0x69, 0x65, 0x73, 0x18,
+ 0x07, 0x20, 0x03, 0x28, 0x09, 0x52, 0x10, 0x70, 0x6f, 0x73, 0x74, 0x42, 0x65, 0x67, 0x69, 0x6e,
+ 0x51, 0x75, 0x65, 0x72, 0x69, 0x65, 0x73, 0x22, 0xa6, 0x02, 0x0a, 0x1b, 0x52, 0x65, 0x73, 0x65,
+ 0x72, 0x76, 0x65, 0x42, 0x65, 0x67, 0x69, 0x6e, 0x45, 0x78, 0x65, 0x63, 0x75, 0x74, 0x65, 0x52,
+ 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x25, 0x0a, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72,
+ 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x76, 0x74, 0x72, 0x70, 0x63, 0x2e, 0x52,
+ 0x50, 0x43, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x52, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x12, 0x2a,
+ 0x0a, 0x06, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12,
+ 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x52, 0x65, 0x73, 0x75,
+ 0x6c, 0x74, 0x52, 0x06, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x12, 0x25, 0x0a, 0x0e, 0x74, 0x72,
+ 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01,
+ 0x28, 0x03, 0x52, 0x0d, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x49,
+ 0x64, 0x12, 0x1f, 0x0a, 0x0b, 0x72, 0x65, 0x73, 0x65, 0x72, 0x76, 0x65, 0x64, 0x5f, 0x69, 0x64,
+ 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x72, 0x65, 0x73, 0x65, 0x72, 0x76, 0x65, 0x64,
+ 0x49, 0x64, 0x12, 0x38, 0x0a, 0x0c, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x5f, 0x61, 0x6c, 0x69,
+ 0x61, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x74, 0x6f, 0x70, 0x6f, 0x64,
+ 0x61, 0x74, 0x61, 0x2e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x41, 0x6c, 0x69, 0x61, 0x73, 0x52,
+ 0x0b, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x41, 0x6c, 0x69, 0x61, 0x73, 0x12, 0x32, 0x0a, 0x15,
+ 0x73, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x5f, 0x73, 0x74, 0x61, 0x74, 0x65, 0x5f, 0x63, 0x68,
+ 0x61, 0x6e, 0x67, 0x65, 0x73, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x13, 0x73, 0x65, 0x73,
+ 0x73, 0x69, 0x6f, 0x6e, 0x53, 0x74, 0x61, 0x74, 0x65, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x73,
+ 0x22, 0xfa, 0x02, 0x0a, 0x20, 0x52, 0x65, 0x73, 0x65, 0x72, 0x76, 0x65, 0x42, 0x65, 0x67, 0x69,
+ 0x6e, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x45, 0x78, 0x65, 0x63, 0x75, 0x74, 0x65, 0x52, 0x65,
+ 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x3f, 0x0a, 0x13, 0x65, 0x66, 0x66, 0x65, 0x63, 0x74, 0x69,
+ 0x76, 0x65, 0x5f, 0x63, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01,
+ 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x76, 0x74, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x61, 0x6c, 0x6c, 0x65,
+ 0x72, 0x49, 0x44, 0x52, 0x11, 0x65, 0x66, 0x66, 0x65, 0x63, 0x74, 0x69, 0x76, 0x65, 0x43, 0x61,
+ 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x64, 0x12, 0x45, 0x0a, 0x13, 0x69, 0x6d, 0x6d, 0x65, 0x64, 0x69,
+ 0x61, 0x74, 0x65, 0x5f, 0x63, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20,
+ 0x01, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x56, 0x54, 0x47, 0x61,
+ 0x74, 0x65, 0x43, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x44, 0x52, 0x11, 0x69, 0x6d, 0x6d, 0x65,
+ 0x64, 0x69, 0x61, 0x74, 0x65, 0x43, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x64, 0x12, 0x25, 0x0a,
+ 0x06, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e,
+ 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x54, 0x61, 0x72, 0x67, 0x65, 0x74, 0x52, 0x06, 0x74, 0x61,
+ 0x72, 0x67, 0x65, 0x74, 0x12, 0x27, 0x0a, 0x05, 0x71, 0x75, 0x65, 0x72, 0x79, 0x18, 0x04, 0x20,
+ 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x42, 0x6f, 0x75, 0x6e,
+ 0x64, 0x51, 0x75, 0x65, 0x72, 0x79, 0x52, 0x05, 0x71, 0x75, 0x65, 0x72, 0x79, 0x12, 0x2f, 0x0a,
+ 0x07, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x15,
+ 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x45, 0x78, 0x65, 0x63, 0x75, 0x74, 0x65, 0x4f, 0x70,
+ 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x07, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x1f,
+ 0x0a, 0x0b, 0x70, 0x72, 0x65, 0x5f, 0x71, 0x75, 0x65, 0x72, 0x69, 0x65, 0x73, 0x18, 0x06, 0x20,
+ 0x03, 0x28, 0x09, 0x52, 0x0a, 0x70, 0x72, 0x65, 0x51, 0x75, 0x65, 0x72, 0x69, 0x65, 0x73, 0x12,
+ 0x2c, 0x0a, 0x12, 0x70, 0x6f, 0x73, 0x74, 0x5f, 0x62, 0x65, 0x67, 0x69, 0x6e, 0x5f, 0x71, 0x75,
+ 0x65, 0x72, 0x69, 0x65, 0x73, 0x18, 0x07, 0x20, 0x03, 0x28, 0x09, 0x52, 0x10, 0x70, 0x6f, 0x73,
+ 0x74, 0x42, 0x65, 0x67, 0x69, 0x6e, 0x51, 0x75, 0x65, 0x72, 0x69, 0x65, 0x73, 0x22, 0xac, 0x02,
+ 0x0a, 0x21, 0x52, 0x65, 0x73, 0x65, 0x72, 0x76, 0x65, 0x42, 0x65, 0x67, 0x69, 0x6e, 0x53, 0x74,
+ 0x72, 0x65, 0x61, 0x6d, 0x45, 0x78, 0x65, 0x63, 0x75, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f,
+ 0x6e, 0x73, 0x65, 0x12, 0x25, 0x0a, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x18, 0x01, 0x20, 0x01,
+ 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x76, 0x74, 0x72, 0x70, 0x63, 0x2e, 0x52, 0x50, 0x43, 0x45, 0x72,
+ 0x72, 0x6f, 0x72, 0x52, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x12, 0x2a, 0x0a, 0x06, 0x72, 0x65,
+ 0x73, 0x75, 0x6c, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x71, 0x75, 0x65,
+ 0x72, 0x79, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x52, 0x06,
+ 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x12, 0x25, 0x0a, 0x0e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61,
+ 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0d,
+ 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x1f, 0x0a,
+ 0x0b, 0x72, 0x65, 0x73, 0x65, 0x72, 0x76, 0x65, 0x64, 0x5f, 0x69, 0x64, 0x18, 0x04, 0x20, 0x01,
+ 0x28, 0x03, 0x52, 0x0a, 0x72, 0x65, 0x73, 0x65, 0x72, 0x76, 0x65, 0x64, 0x49, 0x64, 0x12, 0x38,
+ 0x0a, 0x0c, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x5f, 0x61, 0x6c, 0x69, 0x61, 0x73, 0x18, 0x05,
+ 0x20, 0x01, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x74, 0x6f, 0x70, 0x6f, 0x64, 0x61, 0x74, 0x61, 0x2e,
+ 0x54, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x41, 0x6c, 0x69, 0x61, 0x73, 0x52, 0x0b, 0x74, 0x61, 0x62,
+ 0x6c, 0x65, 0x74, 0x41, 0x6c, 0x69, 0x61, 0x73, 0x12, 0x32, 0x0a, 0x15, 0x73, 0x65, 0x73, 0x73,
+ 0x69, 0x6f, 0x6e, 0x5f, 0x73, 0x74, 0x61, 0x74, 0x65, 0x5f, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65,
+ 0x73, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x13, 0x73, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e,
+ 0x53, 0x74, 0x61, 0x74, 0x65, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x73, 0x22, 0x87, 0x02, 0x0a,
+ 0x0e, 0x52, 0x65, 0x6c, 0x65, 0x61, 0x73, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12,
+ 0x3f, 0x0a, 0x13, 0x65, 0x66, 0x66, 0x65, 0x63, 0x74, 0x69, 0x76, 0x65, 0x5f, 0x63, 0x61, 0x6c,
+ 0x6c, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x76,
+ 0x74, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x44, 0x52, 0x11, 0x65,
+ 0x66, 0x66, 0x65, 0x63, 0x74, 0x69, 0x76, 0x65, 0x43, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x64,
+ 0x12, 0x45, 0x0a, 0x13, 0x69, 0x6d, 0x6d, 0x65, 0x64, 0x69, 0x61, 0x74, 0x65, 0x5f, 0x63, 0x61,
+ 0x6c, 0x6c, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x15, 0x2e,
+ 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x56, 0x54, 0x47, 0x61, 0x74, 0x65, 0x43, 0x61, 0x6c, 0x6c,
+ 0x65, 0x72, 0x49, 0x44, 0x52, 0x11, 0x69, 0x6d, 0x6d, 0x65, 0x64, 0x69, 0x61, 0x74, 0x65, 0x43,
+ 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x64, 0x12, 0x25, 0x0a, 0x06, 0x74, 0x61, 0x72, 0x67, 0x65,
+ 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e,
+ 0x54, 0x61, 0x72, 0x67, 0x65, 0x74, 0x52, 0x06, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x12, 0x25,
+ 0x0a, 0x0e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x69, 0x64,
+ 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0d, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74,
+ 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x1f, 0x0a, 0x0b, 0x72, 0x65, 0x73, 0x65, 0x72, 0x76, 0x65,
+ 0x64, 0x5f, 0x69, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x72, 0x65, 0x73, 0x65,
+ 0x72, 0x76, 0x65, 0x64, 0x49, 0x64, 0x22, 0x11, 0x0a, 0x0f, 0x52, 0x65, 0x6c, 0x65, 0x61, 0x73,
+ 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x15, 0x0a, 0x13, 0x53, 0x74, 0x72,
+ 0x65, 0x61, 0x6d, 0x48, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
+ 0x22, 0xbe, 0x03, 0x0a, 0x0d, 0x52, 0x65, 0x61, 0x6c, 0x74, 0x69, 0x6d, 0x65, 0x53, 0x74, 0x61,
+ 0x74, 0x73, 0x12, 0x21, 0x0a, 0x0c, 0x68, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x5f, 0x65, 0x72, 0x72,
+ 0x6f, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x68, 0x65, 0x61, 0x6c, 0x74, 0x68,
+ 0x45, 0x72, 0x72, 0x6f, 0x72, 0x12, 0x36, 0x0a, 0x17, 0x72, 0x65, 0x70, 0x6c, 0x69, 0x63, 0x61,
+ 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x6c, 0x61, 0x67, 0x5f, 0x73, 0x65, 0x63, 0x6f, 0x6e, 0x64, 0x73,
+ 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x15, 0x72, 0x65, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74,
+ 0x69, 0x6f, 0x6e, 0x4c, 0x61, 0x67, 0x53, 0x65, 0x63, 0x6f, 0x6e, 0x64, 0x73, 0x12, 0x30, 0x0a,
+ 0x14, 0x62, 0x69, 0x6e, 0x6c, 0x6f, 0x67, 0x5f, 0x70, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x73, 0x5f,
+ 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x12, 0x62, 0x69, 0x6e,
+ 0x6c, 0x6f, 0x67, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x73, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12,
+ 0x47, 0x0a, 0x20, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x65, 0x64, 0x5f, 0x72, 0x65, 0x70, 0x6c,
0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x6c, 0x61, 0x67, 0x5f, 0x73, 0x65, 0x63, 0x6f,
- 0x6e, 0x64, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x15, 0x72, 0x65, 0x70, 0x6c, 0x69,
- 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4c, 0x61, 0x67, 0x53, 0x65, 0x63, 0x6f, 0x6e, 0x64, 0x73,
- 0x12, 0x30, 0x0a, 0x14, 0x62, 0x69, 0x6e, 0x6c, 0x6f, 0x67, 0x5f, 0x70, 0x6c, 0x61, 0x79, 0x65,
- 0x72, 0x73, 0x5f, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x12,
- 0x62, 0x69, 0x6e, 0x6c, 0x6f, 0x67, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x73, 0x43, 0x6f, 0x75,
- 0x6e, 0x74, 0x12, 0x47, 0x0a, 0x20, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x65, 0x64, 0x5f, 0x72,
+ 0x6e, 0x64, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x1d, 0x66, 0x69, 0x6c, 0x74, 0x65,
+ 0x72, 0x65, 0x64, 0x52, 0x65, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4c, 0x61,
+ 0x67, 0x53, 0x65, 0x63, 0x6f, 0x6e, 0x64, 0x73, 0x12, 0x1b, 0x0a, 0x09, 0x63, 0x70, 0x75, 0x5f,
+ 0x75, 0x73, 0x61, 0x67, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x01, 0x52, 0x08, 0x63, 0x70, 0x75,
+ 0x55, 0x73, 0x61, 0x67, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x71, 0x70, 0x73, 0x18, 0x06, 0x20, 0x01,
+ 0x28, 0x01, 0x52, 0x03, 0x71, 0x70, 0x73, 0x12, 0x30, 0x0a, 0x14, 0x74, 0x61, 0x62, 0x6c, 0x65,
+ 0x5f, 0x73, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x5f, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x64, 0x18,
+ 0x07, 0x20, 0x03, 0x28, 0x09, 0x52, 0x12, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x53, 0x63, 0x68, 0x65,
+ 0x6d, 0x61, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x64, 0x12, 0x2e, 0x0a, 0x13, 0x76, 0x69, 0x65,
+ 0x77, 0x5f, 0x73, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x5f, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x64,
+ 0x18, 0x08, 0x20, 0x03, 0x28, 0x09, 0x52, 0x11, 0x76, 0x69, 0x65, 0x77, 0x53, 0x63, 0x68, 0x65,
+ 0x6d, 0x61, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x64, 0x12, 0x21, 0x0a, 0x0c, 0x75, 0x64, 0x66,
+ 0x73, 0x5f, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x64, 0x18, 0x09, 0x20, 0x01, 0x28, 0x08, 0x52,
+ 0x0b, 0x75, 0x64, 0x66, 0x73, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x64, 0x12, 0x23, 0x0a, 0x0d,
+ 0x74, 0x78, 0x5f, 0x75, 0x6e, 0x72, 0x65, 0x73, 0x6f, 0x6c, 0x76, 0x65, 0x64, 0x18, 0x0a, 0x20,
+ 0x01, 0x28, 0x08, 0x52, 0x0c, 0x74, 0x78, 0x55, 0x6e, 0x72, 0x65, 0x73, 0x6f, 0x6c, 0x76, 0x65,
+ 0x64, 0x22, 0xf6, 0x01, 0x0a, 0x0e, 0x41, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x65, 0x53,
+ 0x74, 0x61, 0x74, 0x73, 0x12, 0x30, 0x0a, 0x14, 0x68, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x79, 0x5f,
+ 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x5f, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01,
+ 0x28, 0x05, 0x52, 0x12, 0x68, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x79, 0x54, 0x61, 0x62, 0x6c, 0x65,
+ 0x74, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x34, 0x0a, 0x16, 0x75, 0x6e, 0x68, 0x65, 0x61, 0x6c,
+ 0x74, 0x68, 0x79, 0x5f, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x5f, 0x63, 0x6f, 0x75, 0x6e, 0x74,
+ 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x14, 0x75, 0x6e, 0x68, 0x65, 0x61, 0x6c, 0x74, 0x68,
+ 0x79, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x3d, 0x0a, 0x1b,
+ 0x72, 0x65, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x6c, 0x61, 0x67, 0x5f,
+ 0x73, 0x65, 0x63, 0x6f, 0x6e, 0x64, 0x73, 0x5f, 0x6d, 0x69, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28,
+ 0x0d, 0x52, 0x18, 0x72, 0x65, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4c, 0x61,
+ 0x67, 0x53, 0x65, 0x63, 0x6f, 0x6e, 0x64, 0x73, 0x4d, 0x69, 0x6e, 0x12, 0x3d, 0x0a, 0x1b, 0x72,
0x65, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x6c, 0x61, 0x67, 0x5f, 0x73,
- 0x65, 0x63, 0x6f, 0x6e, 0x64, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x1d, 0x66, 0x69,
- 0x6c, 0x74, 0x65, 0x72, 0x65, 0x64, 0x52, 0x65, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f,
- 0x6e, 0x4c, 0x61, 0x67, 0x53, 0x65, 0x63, 0x6f, 0x6e, 0x64, 0x73, 0x12, 0x1b, 0x0a, 0x09, 0x63,
- 0x70, 0x75, 0x5f, 0x75, 0x73, 0x61, 0x67, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x01, 0x52, 0x08,
- 0x63, 0x70, 0x75, 0x55, 0x73, 0x61, 0x67, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x71, 0x70, 0x73, 0x18,
- 0x06, 0x20, 0x01, 0x28, 0x01, 0x52, 0x03, 0x71, 0x70, 0x73, 0x12, 0x30, 0x0a, 0x14, 0x74, 0x61,
- 0x62, 0x6c, 0x65, 0x5f, 0x73, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x5f, 0x63, 0x68, 0x61, 0x6e, 0x67,
- 0x65, 0x64, 0x18, 0x07, 0x20, 0x03, 0x28, 0x09, 0x52, 0x12, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x53,
- 0x63, 0x68, 0x65, 0x6d, 0x61, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x64, 0x12, 0x2e, 0x0a, 0x13,
- 0x76, 0x69, 0x65, 0x77, 0x5f, 0x73, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x5f, 0x63, 0x68, 0x61, 0x6e,
- 0x67, 0x65, 0x64, 0x18, 0x08, 0x20, 0x03, 0x28, 0x09, 0x52, 0x11, 0x76, 0x69, 0x65, 0x77, 0x53,
- 0x63, 0x68, 0x65, 0x6d, 0x61, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x64, 0x12, 0x21, 0x0a, 0x0c,
- 0x75, 0x64, 0x66, 0x73, 0x5f, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x64, 0x18, 0x09, 0x20, 0x01,
- 0x28, 0x08, 0x52, 0x0b, 0x75, 0x64, 0x66, 0x73, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x64, 0x12,
- 0x23, 0x0a, 0x0d, 0x74, 0x78, 0x5f, 0x75, 0x6e, 0x72, 0x65, 0x73, 0x6f, 0x6c, 0x76, 0x65, 0x64,
- 0x18, 0x0a, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0c, 0x74, 0x78, 0x55, 0x6e, 0x72, 0x65, 0x73, 0x6f,
- 0x6c, 0x76, 0x65, 0x64, 0x22, 0xf6, 0x01, 0x0a, 0x0e, 0x41, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61,
- 0x74, 0x65, 0x53, 0x74, 0x61, 0x74, 0x73, 0x12, 0x30, 0x0a, 0x14, 0x68, 0x65, 0x61, 0x6c, 0x74,
- 0x68, 0x79, 0x5f, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x5f, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18,
- 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x12, 0x68, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x79, 0x54, 0x61,
- 0x62, 0x6c, 0x65, 0x74, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x34, 0x0a, 0x16, 0x75, 0x6e, 0x68,
- 0x65, 0x61, 0x6c, 0x74, 0x68, 0x79, 0x5f, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x5f, 0x63, 0x6f,
- 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x14, 0x75, 0x6e, 0x68, 0x65, 0x61,
- 0x6c, 0x74, 0x68, 0x79, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12,
- 0x3d, 0x0a, 0x1b, 0x72, 0x65, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x6c,
- 0x61, 0x67, 0x5f, 0x73, 0x65, 0x63, 0x6f, 0x6e, 0x64, 0x73, 0x5f, 0x6d, 0x69, 0x6e, 0x18, 0x03,
- 0x20, 0x01, 0x28, 0x0d, 0x52, 0x18, 0x72, 0x65, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f,
- 0x6e, 0x4c, 0x61, 0x67, 0x53, 0x65, 0x63, 0x6f, 0x6e, 0x64, 0x73, 0x4d, 0x69, 0x6e, 0x12, 0x3d,
- 0x0a, 0x1b, 0x72, 0x65, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x6c, 0x61,
- 0x67, 0x5f, 0x73, 0x65, 0x63, 0x6f, 0x6e, 0x64, 0x73, 0x5f, 0x6d, 0x61, 0x78, 0x18, 0x04, 0x20,
- 0x01, 0x28, 0x0d, 0x52, 0x18, 0x72, 0x65, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e,
- 0x4c, 0x61, 0x67, 0x53, 0x65, 0x63, 0x6f, 0x6e, 0x64, 0x73, 0x4d, 0x61, 0x78, 0x22, 0x95, 0x02,
- 0x0a, 0x14, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x48, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x52, 0x65,
- 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x25, 0x0a, 0x06, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74,
- 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x54,
- 0x61, 0x72, 0x67, 0x65, 0x74, 0x52, 0x06, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x12, 0x18, 0x0a,
- 0x07, 0x73, 0x65, 0x72, 0x76, 0x69, 0x6e, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07,
- 0x73, 0x65, 0x72, 0x76, 0x69, 0x6e, 0x67, 0x12, 0x3f, 0x0a, 0x1c, 0x70, 0x72, 0x69, 0x6d, 0x61,
- 0x72, 0x79, 0x5f, 0x74, 0x65, 0x72, 0x6d, 0x5f, 0x73, 0x74, 0x61, 0x72, 0x74, 0x5f, 0x74, 0x69,
- 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x19, 0x70,
- 0x72, 0x69, 0x6d, 0x61, 0x72, 0x79, 0x54, 0x65, 0x72, 0x6d, 0x53, 0x74, 0x61, 0x72, 0x74, 0x54,
- 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x12, 0x3b, 0x0a, 0x0e, 0x72, 0x65, 0x61, 0x6c,
- 0x74, 0x69, 0x6d, 0x65, 0x5f, 0x73, 0x74, 0x61, 0x74, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b,
- 0x32, 0x14, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x52, 0x65, 0x61, 0x6c, 0x74, 0x69, 0x6d,
- 0x65, 0x53, 0x74, 0x61, 0x74, 0x73, 0x52, 0x0d, 0x72, 0x65, 0x61, 0x6c, 0x74, 0x69, 0x6d, 0x65,
- 0x53, 0x74, 0x61, 0x74, 0x73, 0x12, 0x38, 0x0a, 0x0c, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x5f,
- 0x61, 0x6c, 0x69, 0x61, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x74, 0x6f,
- 0x70, 0x6f, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x41, 0x6c, 0x69,
- 0x61, 0x73, 0x52, 0x0b, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x41, 0x6c, 0x69, 0x61, 0x73, 0x4a,
- 0x04, 0x08, 0x06, 0x10, 0x07, 0x22, 0xae, 0x01, 0x0a, 0x13, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x61,
- 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x12, 0x12, 0x0a,
- 0x04, 0x64, 0x74, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x64, 0x74, 0x69,
- 0x64, 0x12, 0x2d, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e,
- 0x32, 0x17, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63,
- 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65,
- 0x12, 0x21, 0x0a, 0x0c, 0x74, 0x69, 0x6d, 0x65, 0x5f, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64,
- 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0b, 0x74, 0x69, 0x6d, 0x65, 0x43, 0x72, 0x65, 0x61,
- 0x74, 0x65, 0x64, 0x12, 0x31, 0x0a, 0x0c, 0x70, 0x61, 0x72, 0x74, 0x69, 0x63, 0x69, 0x70, 0x61,
- 0x6e, 0x74, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x71, 0x75, 0x65, 0x72,
- 0x79, 0x2e, 0x54, 0x61, 0x72, 0x67, 0x65, 0x74, 0x52, 0x0c, 0x70, 0x61, 0x72, 0x74, 0x69, 0x63,
- 0x69, 0x70, 0x61, 0x6e, 0x74, 0x73, 0x22, 0x91, 0x01, 0x0a, 0x10, 0x47, 0x65, 0x74, 0x53, 0x63,
- 0x68, 0x65, 0x6d, 0x61, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x25, 0x0a, 0x06, 0x74,
- 0x61, 0x72, 0x67, 0x65, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x71, 0x75,
- 0x65, 0x72, 0x79, 0x2e, 0x54, 0x61, 0x72, 0x67, 0x65, 0x74, 0x52, 0x06, 0x74, 0x61, 0x72, 0x67,
- 0x65, 0x74, 0x12, 0x35, 0x0a, 0x0a, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x74, 0x79, 0x70, 0x65,
- 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x16, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x53,
- 0x63, 0x68, 0x65, 0x6d, 0x61, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x54, 0x79, 0x70, 0x65, 0x52, 0x09,
- 0x74, 0x61, 0x62, 0x6c, 0x65, 0x54, 0x79, 0x70, 0x65, 0x12, 0x1f, 0x0a, 0x0b, 0x74, 0x61, 0x62,
- 0x6c, 0x65, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0a,
- 0x74, 0x61, 0x62, 0x6c, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x22, 0x6d, 0x0a, 0x07, 0x55, 0x44,
- 0x46, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20,
- 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x61, 0x67, 0x67,
- 0x72, 0x65, 0x67, 0x61, 0x74, 0x69, 0x6e, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0b,
- 0x61, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x69, 0x6e, 0x67, 0x12, 0x2c, 0x0a, 0x0b, 0x72,
- 0x65, 0x74, 0x75, 0x72, 0x6e, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0e,
- 0x32, 0x0b, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x52, 0x0a, 0x72,
- 0x65, 0x74, 0x75, 0x72, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x22, 0xd5, 0x01, 0x0a, 0x11, 0x47, 0x65,
- 0x74, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12,
- 0x22, 0x0a, 0x04, 0x75, 0x64, 0x66, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0e, 0x2e,
- 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x55, 0x44, 0x46, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x75,
- 0x64, 0x66, 0x73, 0x12, 0x58, 0x0a, 0x10, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x64, 0x65, 0x66,
- 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2d, 0x2e,
- 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x47, 0x65, 0x74, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x52,
- 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x44, 0x65, 0x66,
- 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0f, 0x74, 0x61,
- 0x62, 0x6c, 0x65, 0x44, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x1a, 0x42, 0x0a,
- 0x14, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x44, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e,
- 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01,
- 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
- 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38,
- 0x01, 0x2a, 0x92, 0x03, 0x0a, 0x09, 0x4d, 0x79, 0x53, 0x71, 0x6c, 0x46, 0x6c, 0x61, 0x67, 0x12,
- 0x09, 0x0a, 0x05, 0x45, 0x4d, 0x50, 0x54, 0x59, 0x10, 0x00, 0x12, 0x11, 0x0a, 0x0d, 0x4e, 0x4f,
- 0x54, 0x5f, 0x4e, 0x55, 0x4c, 0x4c, 0x5f, 0x46, 0x4c, 0x41, 0x47, 0x10, 0x01, 0x12, 0x10, 0x0a,
- 0x0c, 0x50, 0x52, 0x49, 0x5f, 0x4b, 0x45, 0x59, 0x5f, 0x46, 0x4c, 0x41, 0x47, 0x10, 0x02, 0x12,
- 0x13, 0x0a, 0x0f, 0x55, 0x4e, 0x49, 0x51, 0x55, 0x45, 0x5f, 0x4b, 0x45, 0x59, 0x5f, 0x46, 0x4c,
- 0x41, 0x47, 0x10, 0x04, 0x12, 0x15, 0x0a, 0x11, 0x4d, 0x55, 0x4c, 0x54, 0x49, 0x50, 0x4c, 0x45,
- 0x5f, 0x4b, 0x45, 0x59, 0x5f, 0x46, 0x4c, 0x41, 0x47, 0x10, 0x08, 0x12, 0x0d, 0x0a, 0x09, 0x42,
- 0x4c, 0x4f, 0x42, 0x5f, 0x46, 0x4c, 0x41, 0x47, 0x10, 0x10, 0x12, 0x11, 0x0a, 0x0d, 0x55, 0x4e,
- 0x53, 0x49, 0x47, 0x4e, 0x45, 0x44, 0x5f, 0x46, 0x4c, 0x41, 0x47, 0x10, 0x20, 0x12, 0x11, 0x0a,
- 0x0d, 0x5a, 0x45, 0x52, 0x4f, 0x46, 0x49, 0x4c, 0x4c, 0x5f, 0x46, 0x4c, 0x41, 0x47, 0x10, 0x40,
- 0x12, 0x10, 0x0a, 0x0b, 0x42, 0x49, 0x4e, 0x41, 0x52, 0x59, 0x5f, 0x46, 0x4c, 0x41, 0x47, 0x10,
- 0x80, 0x01, 0x12, 0x0e, 0x0a, 0x09, 0x45, 0x4e, 0x55, 0x4d, 0x5f, 0x46, 0x4c, 0x41, 0x47, 0x10,
- 0x80, 0x02, 0x12, 0x18, 0x0a, 0x13, 0x41, 0x55, 0x54, 0x4f, 0x5f, 0x49, 0x4e, 0x43, 0x52, 0x45,
- 0x4d, 0x45, 0x4e, 0x54, 0x5f, 0x46, 0x4c, 0x41, 0x47, 0x10, 0x80, 0x04, 0x12, 0x13, 0x0a, 0x0e,
- 0x54, 0x49, 0x4d, 0x45, 0x53, 0x54, 0x41, 0x4d, 0x50, 0x5f, 0x46, 0x4c, 0x41, 0x47, 0x10, 0x80,
- 0x08, 0x12, 0x0d, 0x0a, 0x08, 0x53, 0x45, 0x54, 0x5f, 0x46, 0x4c, 0x41, 0x47, 0x10, 0x80, 0x10,
- 0x12, 0x1a, 0x0a, 0x15, 0x4e, 0x4f, 0x5f, 0x44, 0x45, 0x46, 0x41, 0x55, 0x4c, 0x54, 0x5f, 0x56,
- 0x41, 0x4c, 0x55, 0x45, 0x5f, 0x46, 0x4c, 0x41, 0x47, 0x10, 0x80, 0x20, 0x12, 0x17, 0x0a, 0x12,
- 0x4f, 0x4e, 0x5f, 0x55, 0x50, 0x44, 0x41, 0x54, 0x45, 0x5f, 0x4e, 0x4f, 0x57, 0x5f, 0x46, 0x4c,
- 0x41, 0x47, 0x10, 0x80, 0x40, 0x12, 0x0e, 0x0a, 0x08, 0x4e, 0x55, 0x4d, 0x5f, 0x46, 0x4c, 0x41,
- 0x47, 0x10, 0x80, 0x80, 0x02, 0x12, 0x13, 0x0a, 0x0d, 0x50, 0x41, 0x52, 0x54, 0x5f, 0x4b, 0x45,
- 0x59, 0x5f, 0x46, 0x4c, 0x41, 0x47, 0x10, 0x80, 0x80, 0x01, 0x12, 0x10, 0x0a, 0x0a, 0x47, 0x52,
- 0x4f, 0x55, 0x50, 0x5f, 0x46, 0x4c, 0x41, 0x47, 0x10, 0x80, 0x80, 0x02, 0x12, 0x11, 0x0a, 0x0b,
- 0x55, 0x4e, 0x49, 0x51, 0x55, 0x45, 0x5f, 0x46, 0x4c, 0x41, 0x47, 0x10, 0x80, 0x80, 0x04, 0x12,
- 0x11, 0x0a, 0x0b, 0x42, 0x49, 0x4e, 0x43, 0x4d, 0x50, 0x5f, 0x46, 0x4c, 0x41, 0x47, 0x10, 0x80,
- 0x80, 0x08, 0x1a, 0x02, 0x10, 0x01, 0x2a, 0x6b, 0x0a, 0x04, 0x46, 0x6c, 0x61, 0x67, 0x12, 0x08,
- 0x0a, 0x04, 0x4e, 0x4f, 0x4e, 0x45, 0x10, 0x00, 0x12, 0x0f, 0x0a, 0x0a, 0x49, 0x53, 0x49, 0x4e,
- 0x54, 0x45, 0x47, 0x52, 0x41, 0x4c, 0x10, 0x80, 0x02, 0x12, 0x0f, 0x0a, 0x0a, 0x49, 0x53, 0x55,
- 0x4e, 0x53, 0x49, 0x47, 0x4e, 0x45, 0x44, 0x10, 0x80, 0x04, 0x12, 0x0c, 0x0a, 0x07, 0x49, 0x53,
- 0x46, 0x4c, 0x4f, 0x41, 0x54, 0x10, 0x80, 0x08, 0x12, 0x0d, 0x0a, 0x08, 0x49, 0x53, 0x51, 0x55,
- 0x4f, 0x54, 0x45, 0x44, 0x10, 0x80, 0x10, 0x12, 0x0b, 0x0a, 0x06, 0x49, 0x53, 0x54, 0x45, 0x58,
- 0x54, 0x10, 0x80, 0x20, 0x12, 0x0d, 0x0a, 0x08, 0x49, 0x53, 0x42, 0x49, 0x4e, 0x41, 0x52, 0x59,
- 0x10, 0x80, 0x40, 0x2a, 0xd7, 0x03, 0x0a, 0x04, 0x54, 0x79, 0x70, 0x65, 0x12, 0x0d, 0x0a, 0x09,
- 0x4e, 0x55, 0x4c, 0x4c, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x10, 0x00, 0x12, 0x09, 0x0a, 0x04, 0x49,
- 0x4e, 0x54, 0x38, 0x10, 0x81, 0x02, 0x12, 0x0a, 0x0a, 0x05, 0x55, 0x49, 0x4e, 0x54, 0x38, 0x10,
- 0x82, 0x06, 0x12, 0x0a, 0x0a, 0x05, 0x49, 0x4e, 0x54, 0x31, 0x36, 0x10, 0x83, 0x02, 0x12, 0x0b,
- 0x0a, 0x06, 0x55, 0x49, 0x4e, 0x54, 0x31, 0x36, 0x10, 0x84, 0x06, 0x12, 0x0a, 0x0a, 0x05, 0x49,
- 0x4e, 0x54, 0x32, 0x34, 0x10, 0x85, 0x02, 0x12, 0x0b, 0x0a, 0x06, 0x55, 0x49, 0x4e, 0x54, 0x32,
- 0x34, 0x10, 0x86, 0x06, 0x12, 0x0a, 0x0a, 0x05, 0x49, 0x4e, 0x54, 0x33, 0x32, 0x10, 0x87, 0x02,
- 0x12, 0x0b, 0x0a, 0x06, 0x55, 0x49, 0x4e, 0x54, 0x33, 0x32, 0x10, 0x88, 0x06, 0x12, 0x0a, 0x0a,
- 0x05, 0x49, 0x4e, 0x54, 0x36, 0x34, 0x10, 0x89, 0x02, 0x12, 0x0b, 0x0a, 0x06, 0x55, 0x49, 0x4e,
- 0x54, 0x36, 0x34, 0x10, 0x8a, 0x06, 0x12, 0x0c, 0x0a, 0x07, 0x46, 0x4c, 0x4f, 0x41, 0x54, 0x33,
- 0x32, 0x10, 0x8b, 0x08, 0x12, 0x0c, 0x0a, 0x07, 0x46, 0x4c, 0x4f, 0x41, 0x54, 0x36, 0x34, 0x10,
- 0x8c, 0x08, 0x12, 0x0e, 0x0a, 0x09, 0x54, 0x49, 0x4d, 0x45, 0x53, 0x54, 0x41, 0x4d, 0x50, 0x10,
- 0x8d, 0x10, 0x12, 0x09, 0x0a, 0x04, 0x44, 0x41, 0x54, 0x45, 0x10, 0x8e, 0x10, 0x12, 0x09, 0x0a,
- 0x04, 0x54, 0x49, 0x4d, 0x45, 0x10, 0x8f, 0x10, 0x12, 0x0d, 0x0a, 0x08, 0x44, 0x41, 0x54, 0x45,
- 0x54, 0x49, 0x4d, 0x45, 0x10, 0x90, 0x10, 0x12, 0x09, 0x0a, 0x04, 0x59, 0x45, 0x41, 0x52, 0x10,
- 0x91, 0x06, 0x12, 0x0b, 0x0a, 0x07, 0x44, 0x45, 0x43, 0x49, 0x4d, 0x41, 0x4c, 0x10, 0x12, 0x12,
- 0x09, 0x0a, 0x04, 0x54, 0x45, 0x58, 0x54, 0x10, 0x93, 0x30, 0x12, 0x09, 0x0a, 0x04, 0x42, 0x4c,
- 0x4f, 0x42, 0x10, 0x94, 0x50, 0x12, 0x0c, 0x0a, 0x07, 0x56, 0x41, 0x52, 0x43, 0x48, 0x41, 0x52,
- 0x10, 0x95, 0x30, 0x12, 0x0e, 0x0a, 0x09, 0x56, 0x41, 0x52, 0x42, 0x49, 0x4e, 0x41, 0x52, 0x59,
- 0x10, 0x96, 0x50, 0x12, 0x09, 0x0a, 0x04, 0x43, 0x48, 0x41, 0x52, 0x10, 0x97, 0x30, 0x12, 0x0b,
- 0x0a, 0x06, 0x42, 0x49, 0x4e, 0x41, 0x52, 0x59, 0x10, 0x98, 0x50, 0x12, 0x08, 0x0a, 0x03, 0x42,
- 0x49, 0x54, 0x10, 0x99, 0x10, 0x12, 0x09, 0x0a, 0x04, 0x45, 0x4e, 0x55, 0x4d, 0x10, 0x9a, 0x10,
- 0x12, 0x08, 0x0a, 0x03, 0x53, 0x45, 0x54, 0x10, 0x9b, 0x10, 0x12, 0x09, 0x0a, 0x05, 0x54, 0x55,
- 0x50, 0x4c, 0x45, 0x10, 0x1c, 0x12, 0x0d, 0x0a, 0x08, 0x47, 0x45, 0x4f, 0x4d, 0x45, 0x54, 0x52,
- 0x59, 0x10, 0x9d, 0x10, 0x12, 0x09, 0x0a, 0x04, 0x4a, 0x53, 0x4f, 0x4e, 0x10, 0x9e, 0x10, 0x12,
- 0x0e, 0x0a, 0x0a, 0x45, 0x58, 0x50, 0x52, 0x45, 0x53, 0x53, 0x49, 0x4f, 0x4e, 0x10, 0x1f, 0x12,
- 0x0b, 0x0a, 0x06, 0x48, 0x45, 0x58, 0x4e, 0x55, 0x4d, 0x10, 0xa0, 0x20, 0x12, 0x0b, 0x0a, 0x06,
- 0x48, 0x45, 0x58, 0x56, 0x41, 0x4c, 0x10, 0xa1, 0x20, 0x12, 0x0b, 0x0a, 0x06, 0x42, 0x49, 0x54,
- 0x4e, 0x55, 0x4d, 0x10, 0xa2, 0x20, 0x12, 0x0b, 0x0a, 0x06, 0x56, 0x45, 0x43, 0x54, 0x4f, 0x52,
- 0x10, 0xa3, 0x10, 0x12, 0x08, 0x0a, 0x03, 0x52, 0x41, 0x57, 0x10, 0xa4, 0x10, 0x2a, 0x36, 0x0a,
- 0x10, 0x53, 0x74, 0x61, 0x72, 0x74, 0x43, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x53, 0x74, 0x61, 0x74,
- 0x65, 0x12, 0x0b, 0x0a, 0x07, 0x55, 0x6e, 0x6b, 0x6e, 0x6f, 0x77, 0x6e, 0x10, 0x00, 0x12, 0x08,
- 0x0a, 0x04, 0x46, 0x61, 0x69, 0x6c, 0x10, 0x01, 0x12, 0x0b, 0x0a, 0x07, 0x53, 0x75, 0x63, 0x63,
- 0x65, 0x73, 0x73, 0x10, 0x02, 0x2a, 0x46, 0x0a, 0x10, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63,
- 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x0b, 0x0a, 0x07, 0x55, 0x4e, 0x4b,
- 0x4e, 0x4f, 0x57, 0x4e, 0x10, 0x00, 0x12, 0x0b, 0x0a, 0x07, 0x50, 0x52, 0x45, 0x50, 0x41, 0x52,
- 0x45, 0x10, 0x01, 0x12, 0x0c, 0x0a, 0x08, 0x52, 0x4f, 0x4c, 0x4c, 0x42, 0x41, 0x43, 0x4b, 0x10,
- 0x02, 0x12, 0x0a, 0x0a, 0x06, 0x43, 0x4f, 0x4d, 0x4d, 0x49, 0x54, 0x10, 0x03, 0x2a, 0x3b, 0x0a,
- 0x0f, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x54, 0x79, 0x70, 0x65,
- 0x12, 0x09, 0x0a, 0x05, 0x56, 0x49, 0x45, 0x57, 0x53, 0x10, 0x00, 0x12, 0x0a, 0x0a, 0x06, 0x54,
- 0x41, 0x42, 0x4c, 0x45, 0x53, 0x10, 0x01, 0x12, 0x07, 0x0a, 0x03, 0x41, 0x4c, 0x4c, 0x10, 0x02,
- 0x12, 0x08, 0x0a, 0x04, 0x55, 0x44, 0x46, 0x53, 0x10, 0x03, 0x42, 0x35, 0x0a, 0x0f, 0x69, 0x6f,
- 0x2e, 0x76, 0x69, 0x74, 0x65, 0x73, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x5a, 0x22, 0x76,
- 0x69, 0x74, 0x65, 0x73, 0x73, 0x2e, 0x69, 0x6f, 0x2f, 0x76, 0x69, 0x74, 0x65, 0x73, 0x73, 0x2f,
- 0x67, 0x6f, 0x2f, 0x76, 0x74, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x71, 0x75, 0x65, 0x72,
- 0x79, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+ 0x65, 0x63, 0x6f, 0x6e, 0x64, 0x73, 0x5f, 0x6d, 0x61, 0x78, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0d,
+ 0x52, 0x18, 0x72, 0x65, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4c, 0x61, 0x67,
+ 0x53, 0x65, 0x63, 0x6f, 0x6e, 0x64, 0x73, 0x4d, 0x61, 0x78, 0x22, 0x95, 0x02, 0x0a, 0x14, 0x53,
+ 0x74, 0x72, 0x65, 0x61, 0x6d, 0x48, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x52, 0x65, 0x73, 0x70, 0x6f,
+ 0x6e, 0x73, 0x65, 0x12, 0x25, 0x0a, 0x06, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x18, 0x01, 0x20,
+ 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x54, 0x61, 0x72, 0x67,
+ 0x65, 0x74, 0x52, 0x06, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x65,
+ 0x72, 0x76, 0x69, 0x6e, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x73, 0x65, 0x72,
+ 0x76, 0x69, 0x6e, 0x67, 0x12, 0x3f, 0x0a, 0x1c, 0x70, 0x72, 0x69, 0x6d, 0x61, 0x72, 0x79, 0x5f,
+ 0x74, 0x65, 0x72, 0x6d, 0x5f, 0x73, 0x74, 0x61, 0x72, 0x74, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x73,
+ 0x74, 0x61, 0x6d, 0x70, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x19, 0x70, 0x72, 0x69, 0x6d,
+ 0x61, 0x72, 0x79, 0x54, 0x65, 0x72, 0x6d, 0x53, 0x74, 0x61, 0x72, 0x74, 0x54, 0x69, 0x6d, 0x65,
+ 0x73, 0x74, 0x61, 0x6d, 0x70, 0x12, 0x3b, 0x0a, 0x0e, 0x72, 0x65, 0x61, 0x6c, 0x74, 0x69, 0x6d,
+ 0x65, 0x5f, 0x73, 0x74, 0x61, 0x74, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e,
+ 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x52, 0x65, 0x61, 0x6c, 0x74, 0x69, 0x6d, 0x65, 0x53, 0x74,
+ 0x61, 0x74, 0x73, 0x52, 0x0d, 0x72, 0x65, 0x61, 0x6c, 0x74, 0x69, 0x6d, 0x65, 0x53, 0x74, 0x61,
+ 0x74, 0x73, 0x12, 0x38, 0x0a, 0x0c, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x5f, 0x61, 0x6c, 0x69,
+ 0x61, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x74, 0x6f, 0x70, 0x6f, 0x64,
+ 0x61, 0x74, 0x61, 0x2e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x41, 0x6c, 0x69, 0x61, 0x73, 0x52,
+ 0x0b, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x41, 0x6c, 0x69, 0x61, 0x73, 0x4a, 0x04, 0x08, 0x06,
+ 0x10, 0x07, 0x22, 0xae, 0x01, 0x0a, 0x13, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69,
+ 0x6f, 0x6e, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x12, 0x12, 0x0a, 0x04, 0x64, 0x74,
+ 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x64, 0x74, 0x69, 0x64, 0x12, 0x2d,
+ 0x0a, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x17, 0x2e,
+ 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f,
+ 0x6e, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, 0x12, 0x21, 0x0a,
+ 0x0c, 0x74, 0x69, 0x6d, 0x65, 0x5f, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x18, 0x03, 0x20,
+ 0x01, 0x28, 0x03, 0x52, 0x0b, 0x74, 0x69, 0x6d, 0x65, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64,
+ 0x12, 0x31, 0x0a, 0x0c, 0x70, 0x61, 0x72, 0x74, 0x69, 0x63, 0x69, 0x70, 0x61, 0x6e, 0x74, 0x73,
+ 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x54,
+ 0x61, 0x72, 0x67, 0x65, 0x74, 0x52, 0x0c, 0x70, 0x61, 0x72, 0x74, 0x69, 0x63, 0x69, 0x70, 0x61,
+ 0x6e, 0x74, 0x73, 0x22, 0x91, 0x01, 0x0a, 0x10, 0x47, 0x65, 0x74, 0x53, 0x63, 0x68, 0x65, 0x6d,
+ 0x61, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x25, 0x0a, 0x06, 0x74, 0x61, 0x72, 0x67,
+ 0x65, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79,
+ 0x2e, 0x54, 0x61, 0x72, 0x67, 0x65, 0x74, 0x52, 0x06, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x12,
+ 0x35, 0x0a, 0x0a, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20,
+ 0x01, 0x28, 0x0e, 0x32, 0x16, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x53, 0x63, 0x68, 0x65,
+ 0x6d, 0x61, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x54, 0x79, 0x70, 0x65, 0x52, 0x09, 0x74, 0x61, 0x62,
+ 0x6c, 0x65, 0x54, 0x79, 0x70, 0x65, 0x12, 0x1f, 0x0a, 0x0b, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x5f,
+ 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0a, 0x74, 0x61, 0x62,
+ 0x6c, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x22, 0x6d, 0x0a, 0x07, 0x55, 0x44, 0x46, 0x49, 0x6e,
+ 0x66, 0x6f, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
+ 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x61, 0x67, 0x67, 0x72, 0x65, 0x67,
+ 0x61, 0x74, 0x69, 0x6e, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0b, 0x61, 0x67, 0x67,
+ 0x72, 0x65, 0x67, 0x61, 0x74, 0x69, 0x6e, 0x67, 0x12, 0x2c, 0x0a, 0x0b, 0x72, 0x65, 0x74, 0x75,
+ 0x72, 0x6e, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0b, 0x2e,
+ 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x52, 0x0a, 0x72, 0x65, 0x74, 0x75,
+ 0x72, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x22, 0xd5, 0x01, 0x0a, 0x11, 0x47, 0x65, 0x74, 0x53, 0x63,
+ 0x68, 0x65, 0x6d, 0x61, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x22, 0x0a, 0x04,
+ 0x75, 0x64, 0x66, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x71, 0x75, 0x65,
+ 0x72, 0x79, 0x2e, 0x55, 0x44, 0x46, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x75, 0x64, 0x66, 0x73,
+ 0x12, 0x58, 0x0a, 0x10, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x64, 0x65, 0x66, 0x69, 0x6e, 0x69,
+ 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2d, 0x2e, 0x71, 0x75, 0x65,
+ 0x72, 0x79, 0x2e, 0x47, 0x65, 0x74, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x52, 0x65, 0x73, 0x70,
+ 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x44, 0x65, 0x66, 0x69, 0x6e, 0x69,
+ 0x74, 0x69, 0x6f, 0x6e, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0f, 0x74, 0x61, 0x62, 0x6c, 0x65,
+ 0x44, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x1a, 0x42, 0x0a, 0x14, 0x54, 0x61,
+ 0x62, 0x6c, 0x65, 0x44, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x45, 0x6e, 0x74,
+ 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
+ 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20,
+ 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x2a, 0x92,
+ 0x03, 0x0a, 0x09, 0x4d, 0x79, 0x53, 0x71, 0x6c, 0x46, 0x6c, 0x61, 0x67, 0x12, 0x09, 0x0a, 0x05,
+ 0x45, 0x4d, 0x50, 0x54, 0x59, 0x10, 0x00, 0x12, 0x11, 0x0a, 0x0d, 0x4e, 0x4f, 0x54, 0x5f, 0x4e,
+ 0x55, 0x4c, 0x4c, 0x5f, 0x46, 0x4c, 0x41, 0x47, 0x10, 0x01, 0x12, 0x10, 0x0a, 0x0c, 0x50, 0x52,
+ 0x49, 0x5f, 0x4b, 0x45, 0x59, 0x5f, 0x46, 0x4c, 0x41, 0x47, 0x10, 0x02, 0x12, 0x13, 0x0a, 0x0f,
+ 0x55, 0x4e, 0x49, 0x51, 0x55, 0x45, 0x5f, 0x4b, 0x45, 0x59, 0x5f, 0x46, 0x4c, 0x41, 0x47, 0x10,
+ 0x04, 0x12, 0x15, 0x0a, 0x11, 0x4d, 0x55, 0x4c, 0x54, 0x49, 0x50, 0x4c, 0x45, 0x5f, 0x4b, 0x45,
+ 0x59, 0x5f, 0x46, 0x4c, 0x41, 0x47, 0x10, 0x08, 0x12, 0x0d, 0x0a, 0x09, 0x42, 0x4c, 0x4f, 0x42,
+ 0x5f, 0x46, 0x4c, 0x41, 0x47, 0x10, 0x10, 0x12, 0x11, 0x0a, 0x0d, 0x55, 0x4e, 0x53, 0x49, 0x47,
+ 0x4e, 0x45, 0x44, 0x5f, 0x46, 0x4c, 0x41, 0x47, 0x10, 0x20, 0x12, 0x11, 0x0a, 0x0d, 0x5a, 0x45,
+ 0x52, 0x4f, 0x46, 0x49, 0x4c, 0x4c, 0x5f, 0x46, 0x4c, 0x41, 0x47, 0x10, 0x40, 0x12, 0x10, 0x0a,
+ 0x0b, 0x42, 0x49, 0x4e, 0x41, 0x52, 0x59, 0x5f, 0x46, 0x4c, 0x41, 0x47, 0x10, 0x80, 0x01, 0x12,
+ 0x0e, 0x0a, 0x09, 0x45, 0x4e, 0x55, 0x4d, 0x5f, 0x46, 0x4c, 0x41, 0x47, 0x10, 0x80, 0x02, 0x12,
+ 0x18, 0x0a, 0x13, 0x41, 0x55, 0x54, 0x4f, 0x5f, 0x49, 0x4e, 0x43, 0x52, 0x45, 0x4d, 0x45, 0x4e,
+ 0x54, 0x5f, 0x46, 0x4c, 0x41, 0x47, 0x10, 0x80, 0x04, 0x12, 0x13, 0x0a, 0x0e, 0x54, 0x49, 0x4d,
+ 0x45, 0x53, 0x54, 0x41, 0x4d, 0x50, 0x5f, 0x46, 0x4c, 0x41, 0x47, 0x10, 0x80, 0x08, 0x12, 0x0d,
+ 0x0a, 0x08, 0x53, 0x45, 0x54, 0x5f, 0x46, 0x4c, 0x41, 0x47, 0x10, 0x80, 0x10, 0x12, 0x1a, 0x0a,
+ 0x15, 0x4e, 0x4f, 0x5f, 0x44, 0x45, 0x46, 0x41, 0x55, 0x4c, 0x54, 0x5f, 0x56, 0x41, 0x4c, 0x55,
+ 0x45, 0x5f, 0x46, 0x4c, 0x41, 0x47, 0x10, 0x80, 0x20, 0x12, 0x17, 0x0a, 0x12, 0x4f, 0x4e, 0x5f,
+ 0x55, 0x50, 0x44, 0x41, 0x54, 0x45, 0x5f, 0x4e, 0x4f, 0x57, 0x5f, 0x46, 0x4c, 0x41, 0x47, 0x10,
+ 0x80, 0x40, 0x12, 0x0e, 0x0a, 0x08, 0x4e, 0x55, 0x4d, 0x5f, 0x46, 0x4c, 0x41, 0x47, 0x10, 0x80,
+ 0x80, 0x02, 0x12, 0x13, 0x0a, 0x0d, 0x50, 0x41, 0x52, 0x54, 0x5f, 0x4b, 0x45, 0x59, 0x5f, 0x46,
+ 0x4c, 0x41, 0x47, 0x10, 0x80, 0x80, 0x01, 0x12, 0x10, 0x0a, 0x0a, 0x47, 0x52, 0x4f, 0x55, 0x50,
+ 0x5f, 0x46, 0x4c, 0x41, 0x47, 0x10, 0x80, 0x80, 0x02, 0x12, 0x11, 0x0a, 0x0b, 0x55, 0x4e, 0x49,
+ 0x51, 0x55, 0x45, 0x5f, 0x46, 0x4c, 0x41, 0x47, 0x10, 0x80, 0x80, 0x04, 0x12, 0x11, 0x0a, 0x0b,
+ 0x42, 0x49, 0x4e, 0x43, 0x4d, 0x50, 0x5f, 0x46, 0x4c, 0x41, 0x47, 0x10, 0x80, 0x80, 0x08, 0x1a,
+ 0x02, 0x10, 0x01, 0x2a, 0x6b, 0x0a, 0x04, 0x46, 0x6c, 0x61, 0x67, 0x12, 0x08, 0x0a, 0x04, 0x4e,
+ 0x4f, 0x4e, 0x45, 0x10, 0x00, 0x12, 0x0f, 0x0a, 0x0a, 0x49, 0x53, 0x49, 0x4e, 0x54, 0x45, 0x47,
+ 0x52, 0x41, 0x4c, 0x10, 0x80, 0x02, 0x12, 0x0f, 0x0a, 0x0a, 0x49, 0x53, 0x55, 0x4e, 0x53, 0x49,
+ 0x47, 0x4e, 0x45, 0x44, 0x10, 0x80, 0x04, 0x12, 0x0c, 0x0a, 0x07, 0x49, 0x53, 0x46, 0x4c, 0x4f,
+ 0x41, 0x54, 0x10, 0x80, 0x08, 0x12, 0x0d, 0x0a, 0x08, 0x49, 0x53, 0x51, 0x55, 0x4f, 0x54, 0x45,
+ 0x44, 0x10, 0x80, 0x10, 0x12, 0x0b, 0x0a, 0x06, 0x49, 0x53, 0x54, 0x45, 0x58, 0x54, 0x10, 0x80,
+ 0x20, 0x12, 0x0d, 0x0a, 0x08, 0x49, 0x53, 0x42, 0x49, 0x4e, 0x41, 0x52, 0x59, 0x10, 0x80, 0x40,
+ 0x2a, 0xd7, 0x03, 0x0a, 0x04, 0x54, 0x79, 0x70, 0x65, 0x12, 0x0d, 0x0a, 0x09, 0x4e, 0x55, 0x4c,
+ 0x4c, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x10, 0x00, 0x12, 0x09, 0x0a, 0x04, 0x49, 0x4e, 0x54, 0x38,
+ 0x10, 0x81, 0x02, 0x12, 0x0a, 0x0a, 0x05, 0x55, 0x49, 0x4e, 0x54, 0x38, 0x10, 0x82, 0x06, 0x12,
+ 0x0a, 0x0a, 0x05, 0x49, 0x4e, 0x54, 0x31, 0x36, 0x10, 0x83, 0x02, 0x12, 0x0b, 0x0a, 0x06, 0x55,
+ 0x49, 0x4e, 0x54, 0x31, 0x36, 0x10, 0x84, 0x06, 0x12, 0x0a, 0x0a, 0x05, 0x49, 0x4e, 0x54, 0x32,
+ 0x34, 0x10, 0x85, 0x02, 0x12, 0x0b, 0x0a, 0x06, 0x55, 0x49, 0x4e, 0x54, 0x32, 0x34, 0x10, 0x86,
+ 0x06, 0x12, 0x0a, 0x0a, 0x05, 0x49, 0x4e, 0x54, 0x33, 0x32, 0x10, 0x87, 0x02, 0x12, 0x0b, 0x0a,
+ 0x06, 0x55, 0x49, 0x4e, 0x54, 0x33, 0x32, 0x10, 0x88, 0x06, 0x12, 0x0a, 0x0a, 0x05, 0x49, 0x4e,
+ 0x54, 0x36, 0x34, 0x10, 0x89, 0x02, 0x12, 0x0b, 0x0a, 0x06, 0x55, 0x49, 0x4e, 0x54, 0x36, 0x34,
+ 0x10, 0x8a, 0x06, 0x12, 0x0c, 0x0a, 0x07, 0x46, 0x4c, 0x4f, 0x41, 0x54, 0x33, 0x32, 0x10, 0x8b,
+ 0x08, 0x12, 0x0c, 0x0a, 0x07, 0x46, 0x4c, 0x4f, 0x41, 0x54, 0x36, 0x34, 0x10, 0x8c, 0x08, 0x12,
+ 0x0e, 0x0a, 0x09, 0x54, 0x49, 0x4d, 0x45, 0x53, 0x54, 0x41, 0x4d, 0x50, 0x10, 0x8d, 0x10, 0x12,
+ 0x09, 0x0a, 0x04, 0x44, 0x41, 0x54, 0x45, 0x10, 0x8e, 0x10, 0x12, 0x09, 0x0a, 0x04, 0x54, 0x49,
+ 0x4d, 0x45, 0x10, 0x8f, 0x10, 0x12, 0x0d, 0x0a, 0x08, 0x44, 0x41, 0x54, 0x45, 0x54, 0x49, 0x4d,
+ 0x45, 0x10, 0x90, 0x10, 0x12, 0x09, 0x0a, 0x04, 0x59, 0x45, 0x41, 0x52, 0x10, 0x91, 0x06, 0x12,
+ 0x0b, 0x0a, 0x07, 0x44, 0x45, 0x43, 0x49, 0x4d, 0x41, 0x4c, 0x10, 0x12, 0x12, 0x09, 0x0a, 0x04,
+ 0x54, 0x45, 0x58, 0x54, 0x10, 0x93, 0x30, 0x12, 0x09, 0x0a, 0x04, 0x42, 0x4c, 0x4f, 0x42, 0x10,
+ 0x94, 0x50, 0x12, 0x0c, 0x0a, 0x07, 0x56, 0x41, 0x52, 0x43, 0x48, 0x41, 0x52, 0x10, 0x95, 0x30,
+ 0x12, 0x0e, 0x0a, 0x09, 0x56, 0x41, 0x52, 0x42, 0x49, 0x4e, 0x41, 0x52, 0x59, 0x10, 0x96, 0x50,
+ 0x12, 0x09, 0x0a, 0x04, 0x43, 0x48, 0x41, 0x52, 0x10, 0x97, 0x30, 0x12, 0x0b, 0x0a, 0x06, 0x42,
+ 0x49, 0x4e, 0x41, 0x52, 0x59, 0x10, 0x98, 0x50, 0x12, 0x08, 0x0a, 0x03, 0x42, 0x49, 0x54, 0x10,
+ 0x99, 0x10, 0x12, 0x09, 0x0a, 0x04, 0x45, 0x4e, 0x55, 0x4d, 0x10, 0x9a, 0x10, 0x12, 0x08, 0x0a,
+ 0x03, 0x53, 0x45, 0x54, 0x10, 0x9b, 0x10, 0x12, 0x09, 0x0a, 0x05, 0x54, 0x55, 0x50, 0x4c, 0x45,
+ 0x10, 0x1c, 0x12, 0x0d, 0x0a, 0x08, 0x47, 0x45, 0x4f, 0x4d, 0x45, 0x54, 0x52, 0x59, 0x10, 0x9d,
+ 0x10, 0x12, 0x09, 0x0a, 0x04, 0x4a, 0x53, 0x4f, 0x4e, 0x10, 0x9e, 0x10, 0x12, 0x0e, 0x0a, 0x0a,
+ 0x45, 0x58, 0x50, 0x52, 0x45, 0x53, 0x53, 0x49, 0x4f, 0x4e, 0x10, 0x1f, 0x12, 0x0b, 0x0a, 0x06,
+ 0x48, 0x45, 0x58, 0x4e, 0x55, 0x4d, 0x10, 0xa0, 0x20, 0x12, 0x0b, 0x0a, 0x06, 0x48, 0x45, 0x58,
+ 0x56, 0x41, 0x4c, 0x10, 0xa1, 0x20, 0x12, 0x0b, 0x0a, 0x06, 0x42, 0x49, 0x54, 0x4e, 0x55, 0x4d,
+ 0x10, 0xa2, 0x20, 0x12, 0x0b, 0x0a, 0x06, 0x56, 0x45, 0x43, 0x54, 0x4f, 0x52, 0x10, 0xa3, 0x10,
+ 0x12, 0x08, 0x0a, 0x03, 0x52, 0x41, 0x57, 0x10, 0xa4, 0x10, 0x2a, 0x36, 0x0a, 0x10, 0x53, 0x74,
+ 0x61, 0x72, 0x74, 0x43, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x0b,
+ 0x0a, 0x07, 0x55, 0x6e, 0x6b, 0x6e, 0x6f, 0x77, 0x6e, 0x10, 0x00, 0x12, 0x08, 0x0a, 0x04, 0x46,
+ 0x61, 0x69, 0x6c, 0x10, 0x01, 0x12, 0x0b, 0x0a, 0x07, 0x53, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73,
+ 0x10, 0x02, 0x2a, 0x46, 0x0a, 0x10, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f,
+ 0x6e, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x0b, 0x0a, 0x07, 0x55, 0x4e, 0x4b, 0x4e, 0x4f, 0x57,
+ 0x4e, 0x10, 0x00, 0x12, 0x0b, 0x0a, 0x07, 0x50, 0x52, 0x45, 0x50, 0x41, 0x52, 0x45, 0x10, 0x01,
+ 0x12, 0x0c, 0x0a, 0x08, 0x52, 0x4f, 0x4c, 0x4c, 0x42, 0x41, 0x43, 0x4b, 0x10, 0x02, 0x12, 0x0a,
+ 0x0a, 0x06, 0x43, 0x4f, 0x4d, 0x4d, 0x49, 0x54, 0x10, 0x03, 0x2a, 0x3b, 0x0a, 0x0f, 0x53, 0x63,
+ 0x68, 0x65, 0x6d, 0x61, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x54, 0x79, 0x70, 0x65, 0x12, 0x09, 0x0a,
+ 0x05, 0x56, 0x49, 0x45, 0x57, 0x53, 0x10, 0x00, 0x12, 0x0a, 0x0a, 0x06, 0x54, 0x41, 0x42, 0x4c,
+ 0x45, 0x53, 0x10, 0x01, 0x12, 0x07, 0x0a, 0x03, 0x41, 0x4c, 0x4c, 0x10, 0x02, 0x12, 0x08, 0x0a,
+ 0x04, 0x55, 0x44, 0x46, 0x53, 0x10, 0x03, 0x42, 0x35, 0x0a, 0x0f, 0x69, 0x6f, 0x2e, 0x76, 0x69,
+ 0x74, 0x65, 0x73, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x5a, 0x22, 0x76, 0x69, 0x74, 0x65,
+ 0x73, 0x73, 0x2e, 0x69, 0x6f, 0x2f, 0x76, 0x69, 0x74, 0x65, 0x73, 0x73, 0x2f, 0x67, 0x6f, 0x2f,
+ 0x76, 0x74, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x71, 0x75, 0x65, 0x72, 0x79, 0x62, 0x06,
+ 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
}
var (
diff --git a/go/vt/proto/query/query_vtproto.pb.go b/go/vt/proto/query/query_vtproto.pb.go
index 2cb69d9406d..21ab8776fc5 100644
--- a/go/vt/proto/query/query_vtproto.pb.go
+++ b/go/vt/proto/query/query_vtproto.pb.go
@@ -176,6 +176,7 @@ func (m *ExecuteOptions) CloneVT() *ExecuteOptions {
r.Consolidator = m.Consolidator
r.WorkloadName = m.WorkloadName
r.Priority = m.Priority
+ r.FetchLastInsertId = m.FetchLastInsertId
if rhs := m.TransactionAccessMode; rhs != nil {
tmpContainer := make([]ExecuteOptions_TransactionAccessMode, len(rhs))
copy(tmpContainer, rhs)
@@ -268,6 +269,7 @@ func (m *QueryResult) CloneVT() *QueryResult {
r.InsertId = m.InsertId
r.Info = m.Info
r.SessionStateChanges = m.SessionStateChanges
+ r.InsertIdChanged = m.InsertIdChanged
if rhs := m.Fields; rhs != nil {
tmpContainer := make([]*Field, len(rhs))
for k, v := range rhs {
@@ -1893,6 +1895,18 @@ func (m *ExecuteOptions) MarshalToSizedBufferVT(dAtA []byte) (int, error) {
}
i -= size
}
+ if m.FetchLastInsertId {
+ i--
+ if m.FetchLastInsertId {
+ dAtA[i] = 1
+ } else {
+ dAtA[i] = 0
+ }
+ i--
+ dAtA[i] = 0x1
+ i--
+ dAtA[i] = 0x90
+ }
if len(m.Priority) > 0 {
i -= len(m.Priority)
copy(dAtA[i:], m.Priority)
@@ -2198,6 +2212,16 @@ func (m *QueryResult) MarshalToSizedBufferVT(dAtA []byte) (int, error) {
i -= len(m.unknownFields)
copy(dAtA[i:], m.unknownFields)
}
+ if m.InsertIdChanged {
+ i--
+ if m.InsertIdChanged {
+ dAtA[i] = 1
+ } else {
+ dAtA[i] = 0
+ }
+ i--
+ dAtA[i] = 0x40
+ }
if len(m.SessionStateChanges) > 0 {
i -= len(m.SessionStateChanges)
copy(dAtA[i:], m.SessionStateChanges)
@@ -6169,6 +6193,9 @@ func (m *ExecuteOptions) SizeVT() (n int) {
if vtmsg, ok := m.Timeout.(interface{ SizeVT() int }); ok {
n += vtmsg.SizeVT()
}
+ if m.FetchLastInsertId {
+ n += 3
+ }
n += len(m.unknownFields)
return n
}
@@ -6284,6 +6311,9 @@ func (m *QueryResult) SizeVT() (n int) {
if l > 0 {
n += 1 + l + protohelpers.SizeOfVarint(uint64(l))
}
+ if m.InsertIdChanged {
+ n += 2
+ }
n += len(m.unknownFields)
return n
}
@@ -8914,6 +8944,26 @@ func (m *ExecuteOptions) UnmarshalVT(dAtA []byte) error {
}
}
m.Timeout = &ExecuteOptions_AuthoritativeTimeout{AuthoritativeTimeout: v}
+ case 18:
+ if wireType != 0 {
+ return fmt.Errorf("proto: wrong wireType = %d for field FetchLastInsertId", wireType)
+ }
+ var v int
+ for shift := uint(0); ; shift += 7 {
+ if shift >= 64 {
+ return protohelpers.ErrIntOverflow
+ }
+ if iNdEx >= l {
+ return io.ErrUnexpectedEOF
+ }
+ b := dAtA[iNdEx]
+ iNdEx++
+ v |= int(b&0x7F) << shift
+ if b < 0x80 {
+ break
+ }
+ }
+ m.FetchLastInsertId = bool(v != 0)
default:
iNdEx = preIndex
skippy, err := protohelpers.Skip(dAtA[iNdEx:])
@@ -9636,6 +9686,26 @@ func (m *QueryResult) UnmarshalVT(dAtA []byte) error {
}
m.SessionStateChanges = string(dAtA[iNdEx:postIndex])
iNdEx = postIndex
+ case 8:
+ if wireType != 0 {
+ return fmt.Errorf("proto: wrong wireType = %d for field InsertIdChanged", wireType)
+ }
+ var v int
+ for shift := uint(0); ; shift += 7 {
+ if shift >= 64 {
+ return protohelpers.ErrIntOverflow
+ }
+ if iNdEx >= l {
+ return io.ErrUnexpectedEOF
+ }
+ b := dAtA[iNdEx]
+ iNdEx++
+ v |= int(b&0x7F) << shift
+ if b < 0x80 {
+ break
+ }
+ }
+ m.InsertIdChanged = bool(v != 0)
default:
iNdEx = preIndex
skippy, err := protohelpers.Skip(dAtA[iNdEx:])
diff --git a/go/vt/vtadmin/api.go b/go/vt/vtadmin/api.go
index 4f91459d9ed..a54090bb044 100644
--- a/go/vt/vtadmin/api.go
+++ b/go/vt/vtadmin/api.go
@@ -1785,7 +1785,7 @@ func (api *API) VDiffShow(ctx context.Context, req *vtadminpb.VDiffShowRequest)
}
}
if report.State == string(vdiff.StartedState) {
- progress := vdiffcmd.BuildProgressReport(report.RowsCompared, totalRowsToCompare, report.StartedAt)
+ progress := workflow.BuildProgressReport(report.RowsCompared, totalRowsToCompare, report.StartedAt)
report.Progress = &vtadminpb.VDiffProgress{
Percentage: progress.Percentage,
Eta: progress.ETA,
diff --git a/go/vt/vtctl/workflow/lookup_vindex.go b/go/vt/vtctl/workflow/lookup_vindex.go
new file mode 100644
index 00000000000..cf9b4833c28
--- /dev/null
+++ b/go/vt/vtctl/workflow/lookup_vindex.go
@@ -0,0 +1,542 @@
+/*
+Copyright 2024 The Vitess Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package workflow
+
+import (
+ "context"
+ "fmt"
+ "slices"
+ "strings"
+
+ "golang.org/x/exp/maps"
+ "google.golang.org/protobuf/proto"
+
+ "vitess.io/vitess/go/sqlescape"
+ "vitess.io/vitess/go/vt/logutil"
+ "vitess.io/vitess/go/vt/schema"
+ "vitess.io/vitess/go/vt/sqlparser"
+ "vitess.io/vitess/go/vt/topo"
+ "vitess.io/vitess/go/vt/vtctl/schematools"
+ "vitess.io/vitess/go/vt/vterrors"
+ "vitess.io/vitess/go/vt/vtgate/vindexes"
+ "vitess.io/vitess/go/vt/vttablet/tmclient"
+
+ tabletmanagerdatapb "vitess.io/vitess/go/vt/proto/tabletmanagerdata"
+ vschemapb "vitess.io/vitess/go/vt/proto/vschema"
+ vtctldatapb "vitess.io/vitess/go/vt/proto/vtctldata"
+ vtrpcpb "vitess.io/vitess/go/vt/proto/vtrpc"
+)
+
+// lookupVindex is responsible for performing actions related to lookup vindexes.
+type lookupVindex struct {
+ ts *topo.Server
+ tmc tmclient.TabletManagerClient
+
+ logger logutil.Logger
+ parser *sqlparser.Parser
+}
+
+// newLookupVindex creates a new lookupVindex instance which is responsible
+// for performing actions related to lookup vindexes.
+func newLookupVindex(ws *Server) *lookupVindex {
+ return &lookupVindex{
+ ts: ws.ts,
+ tmc: ws.tmc,
+ logger: ws.Logger(),
+ parser: ws.SQLParser(),
+ }
+}
+
+// prepareCreate performs the preparatory steps for creating a Lookup Vindex.
+func (lv *lookupVindex) prepareCreate(ctx context.Context, workflow, keyspace string, specs *vschemapb.Keyspace, continueAfterCopyWithOwner bool) (
+ ms *vtctldatapb.MaterializeSettings, sourceVSchema, targetVSchema *vschemapb.Keyspace, cancelFunc func() error, err error) {
+ var (
+ // sourceVSchemaTable is the table info present in the vschema.
+ sourceVSchemaTable *vschemapb.Table
+ // sourceVindexColumns are computed from the input sourceTable.
+ sourceVindexColumns []string
+
+ // Target table info.
+ createDDL string
+ materializeQuery string
+ )
+
+ // Validate input vindex.
+ vindex, vInfo, err := lv.validateAndGetVindex(specs)
+ if err != nil {
+ return nil, nil, nil, nil, err
+ }
+
+ vInfo.sourceTable, vInfo.sourceTableName, err = getSourceTable(specs, vInfo.targetTableName, vInfo.fromCols)
+ if err != nil {
+ return nil, nil, nil, nil, err
+ }
+
+ sourceVindexColumns, err = validateSourceTableAndGetVindexColumns(vInfo, vindex, keyspace)
+ if err != nil {
+ return nil, nil, nil, nil, err
+ }
+
+ sourceVSchema, targetVSchema, err = lv.getTargetAndSourceVSchema(ctx, keyspace, vInfo.targetKeyspace)
+ if err != nil {
+ return nil, nil, nil, nil, err
+ }
+
+ if existing, ok := sourceVSchema.Vindexes[vInfo.name]; ok {
+ if !proto.Equal(existing, vindex) { // If the exact same vindex already exists then we can re-use it
+ return nil, nil, nil, nil, vterrors.Errorf(vtrpcpb.Code_INTERNAL, "a conflicting vindex named %s already exists in the %s keyspace",
+ vInfo.name, keyspace)
+ }
+ }
+
+ sourceVSchemaTable = sourceVSchema.Tables[vInfo.sourceTableName]
+ if sourceVSchemaTable == nil && !schema.IsInternalOperationTableName(vInfo.sourceTableName) {
+ return nil, nil, nil, nil,
+ vterrors.Errorf(vtrpcpb.Code_INTERNAL, "table %s not found in the %s keyspace", vInfo.sourceTableName, keyspace)
+ }
+ if err := validateNonConflictingColumnVindex(sourceVSchemaTable, vInfo, sourceVindexColumns, keyspace); err != nil {
+ return nil, nil, nil, nil, err
+ }
+
+ // Validate against source schema.
+ sourceShards, err := lv.ts.GetServingShards(ctx, keyspace)
+ if err != nil {
+ return nil, nil, nil, nil, err
+ }
+ onesource := sourceShards[0]
+ if onesource.PrimaryAlias == nil {
+ return nil, nil, nil, nil,
+ vterrors.Errorf(vtrpcpb.Code_INTERNAL, "source shard %s has no primary", onesource.ShardName())
+ }
+
+ req := &tabletmanagerdatapb.GetSchemaRequest{Tables: []string{vInfo.sourceTableName}}
+ tableSchema, err := schematools.GetSchema(ctx, lv.ts, lv.tmc, onesource.PrimaryAlias, req)
+ if err != nil {
+ return nil, nil, nil, nil, err
+ }
+ if len(tableSchema.TableDefinitions) != 1 {
+ return nil, nil, nil, nil,
+ vterrors.Errorf(vtrpcpb.Code_INTERNAL, "unexpected number of tables (%d) returned from %s schema",
+ len(tableSchema.TableDefinitions), keyspace)
+ }
+
+ // Generate "create table" statement.
+ createDDL, err = lv.generateCreateDDLStatement(tableSchema, sourceVindexColumns, vInfo, vindex)
+ if err != nil {
+ return nil, nil, nil, nil, err
+ }
+
+ // Generate vreplication query.
+ materializeQuery = generateMaterializeQuery(vInfo, vindex, sourceVindexColumns)
+
+ // Save a copy of the original vschema if we modify it and need to provide
+ // a cancelFunc.
+ ogTargetVSchema := targetVSchema.CloneVT()
+ targetChanged := false
+
+ // Update targetVSchema.
+ targetTable := specs.Tables[vInfo.targetTableName]
+ if targetVSchema.Sharded {
+ // Choose a primary vindex type for the lookup table based on the source
+ // definition if one was not explicitly specified.
+ var targetVindexType string
+ var targetVindex *vschemapb.Vindex
+ for _, field := range tableSchema.TableDefinitions[0].Fields {
+ if sourceVindexColumns[0] == field.Name {
+ if targetTable != nil && len(targetTable.ColumnVindexes) > 0 {
+ targetVindexType = targetTable.ColumnVindexes[0].Name
+ }
+ if targetVindexType == "" {
+ targetVindexType, err = vindexes.ChooseVindexForType(field.Type)
+ if err != nil {
+ return nil, nil, nil, nil, err
+ }
+ }
+ targetVindex = &vschemapb.Vindex{
+ Type: targetVindexType,
+ }
+ break
+ }
+ }
+ if targetVindex == nil {
+ // Unreachable. We validated column names when generating the DDL.
+ return nil, nil, nil, nil,
+ vterrors.Errorf(vtrpcpb.Code_INTERNAL, "column %s not found in target schema %s",
+ sourceVindexColumns[0], tableSchema.TableDefinitions[0].Schema)
+ }
+
+ if existing, ok := targetVSchema.Vindexes[targetVindexType]; ok {
+ if !proto.Equal(existing, targetVindex) {
+ return nil, nil, nil, nil,
+ vterrors.Errorf(vtrpcpb.Code_INVALID_ARGUMENT, "a conflicting vindex named %v already exists in the %s keyspace",
+ targetVindexType, vInfo.targetKeyspace)
+ }
+ } else {
+ targetVSchema.Vindexes[targetVindexType] = targetVindex
+ targetChanged = true
+ }
+
+ targetTable = &vschemapb.Table{
+ ColumnVindexes: []*vschemapb.ColumnVindex{{
+ Column: vInfo.fromCols[0],
+ Name: targetVindexType,
+ }},
+ }
+ } else {
+ targetTable = &vschemapb.Table{}
+ }
+ if existing, ok := targetVSchema.Tables[vInfo.targetTableName]; ok {
+ if !proto.Equal(existing, targetTable) {
+ return nil, nil, nil, nil,
+ vterrors.Errorf(vtrpcpb.Code_INVALID_ARGUMENT, "a conflicting table named %s already exists in the %s vschema",
+ vInfo.targetTableName, vInfo.targetKeyspace)
+ }
+ } else {
+ targetVSchema.Tables[vInfo.targetTableName] = targetTable
+ targetChanged = true
+ }
+
+ if targetChanged {
+ cancelFunc = func() error {
+ // Restore the original target vschema.
+ return lv.ts.SaveVSchema(ctx, vInfo.targetKeyspace, ogTargetVSchema)
+ }
+ }
+
+ ms = &vtctldatapb.MaterializeSettings{
+ Workflow: workflow,
+ MaterializationIntent: vtctldatapb.MaterializationIntent_CREATELOOKUPINDEX,
+ SourceKeyspace: keyspace,
+ TargetKeyspace: vInfo.targetKeyspace,
+ StopAfterCopy: vindex.Owner != "" && !continueAfterCopyWithOwner,
+ TableSettings: []*vtctldatapb.TableMaterializeSettings{{
+ TargetTable: vInfo.targetTableName,
+ SourceExpression: materializeQuery,
+ CreateDdl: createDDL,
+ }},
+ }
+
+ // Update sourceVSchema
+ sourceVSchema.Vindexes[vInfo.name] = vindex
+ sourceVSchemaTable.ColumnVindexes = append(sourceVSchemaTable.ColumnVindexes, vInfo.sourceTable.ColumnVindexes[0])
+
+ return ms, sourceVSchema, targetVSchema, cancelFunc, nil
+}
+
+// vindexInfo holds the validated vindex configuration
+type vindexInfo struct {
+ name string
+ targetKeyspace string
+ targetTableName string
+ fromCols []string
+ toCol string
+ ignoreNulls bool
+
+ // sourceTable is the supplied table info.
+ sourceTable *vschemapb.Table
+ sourceTableName string
+}
+
+// validateAndGetVindex validates and extracts vindex configuration
+func (lv *lookupVindex) validateAndGetVindex(specs *vschemapb.Keyspace) (*vschemapb.Vindex, *vindexInfo, error) {
+ if specs == nil {
+ return nil, nil, vterrors.Errorf(vtrpcpb.Code_INVALID_ARGUMENT, "no vindex provided")
+ }
+ if len(specs.Vindexes) != 1 {
+ return nil, nil, vterrors.Errorf(vtrpcpb.Code_INVALID_ARGUMENT, "only one vindex must be specified")
+ }
+
+ vindexName := maps.Keys(specs.Vindexes)[0]
+ vindex := maps.Values(specs.Vindexes)[0]
+
+ if !strings.Contains(vindex.Type, "lookup") {
+ return nil, nil, vterrors.Errorf(vtrpcpb.Code_INVALID_ARGUMENT, "vindex %s is not a lookup type", vindex.Type)
+ }
+
+ targetKeyspace, targetTableName, err := lv.parser.ParseTable(vindex.Params["table"])
+ if err != nil || targetKeyspace == "" {
+ return nil, nil, vterrors.Errorf(vtrpcpb.Code_INVALID_ARGUMENT,
+ "vindex table name (%s) must be in the form .", vindex.Params["table"])
+ }
+
+ vindexFromCols := strings.Split(vindex.Params["from"], ",")
+ for i, col := range vindexFromCols {
+ vindexFromCols[i] = strings.TrimSpace(col)
+ }
+
+ if strings.Contains(vindex.Type, "unique") {
+ if len(vindexFromCols) != 1 {
+ return nil, nil, vterrors.Errorf(vtrpcpb.Code_INVALID_ARGUMENT, "unique vindex 'from' should have only one column")
+ }
+ }
+
+ vindexToCol := vindex.Params["to"]
+ // Make the vindex write_only. If one exists already in the vschema,
+ // it will need to match this vindex exactly, including the write_only setting.
+ vindex.Params["write_only"] = "true"
+
+ // See if we can create the vindex without errors.
+ if _, err := vindexes.CreateVindex(vindex.Type, vindexName, vindex.Params); err != nil {
+ return nil, nil, err
+ }
+
+ ignoreNulls := false
+ if ignoreNullsStr, ok := vindex.Params["ignore_nulls"]; ok {
+ // This mirrors the behavior of vindexes.boolFromMap().
+ switch ignoreNullsStr {
+ case "true":
+ ignoreNulls = true
+ case "false":
+ ignoreNulls = false
+ default:
+ return nil, nil,
+ vterrors.Errorf(vtrpcpb.Code_INVALID_ARGUMENT, "ignore_nulls (%s) value must be 'true' or 'false'",
+ ignoreNullsStr)
+ }
+ }
+
+ // Validate input table.
+ if len(specs.Tables) < 1 || len(specs.Tables) > 2 {
+ return nil, nil, fmt.Errorf("one or two tables must be specified")
+ }
+
+ return vindex, &vindexInfo{
+ name: vindexName,
+ targetKeyspace: targetKeyspace,
+ targetTableName: targetTableName,
+ fromCols: vindexFromCols,
+ toCol: vindexToCol,
+ ignoreNulls: ignoreNulls,
+ }, nil
+}
+
+func (lv *lookupVindex) getTargetAndSourceVSchema(ctx context.Context, sourceKeyspace string, targetKeyspace string) (sourceVSchema *vschemapb.Keyspace, targetVSchema *vschemapb.Keyspace, err error) {
+ sourceVSchema, err = lv.ts.GetVSchema(ctx, sourceKeyspace)
+ if err != nil {
+ return nil, nil, err
+ }
+ if sourceVSchema.Vindexes == nil {
+ sourceVSchema.Vindexes = make(map[string]*vschemapb.Vindex)
+ }
+ // If source and target keyspaces are the same, make vschemas point
+ // to the same object.
+ if sourceKeyspace == targetKeyspace {
+ targetVSchema = sourceVSchema
+ } else {
+ targetVSchema, err = lv.ts.GetVSchema(ctx, targetKeyspace)
+ if err != nil {
+ return nil, nil, err
+ }
+ }
+ if targetVSchema.Vindexes == nil {
+ targetVSchema.Vindexes = make(map[string]*vschemapb.Vindex)
+ }
+ if targetVSchema.Tables == nil {
+ targetVSchema.Tables = make(map[string]*vschemapb.Table)
+ }
+
+ return sourceVSchema, targetVSchema, nil
+}
+
+func getSourceTable(specs *vschemapb.Keyspace, targetTableName string, fromCols []string) (sourceTable *vschemapb.Table, sourceTableName string, err error) {
+ // Loop executes once or twice.
+ for tableName, table := range specs.Tables {
+ if len(table.ColumnVindexes) != 1 {
+ return nil, "", vterrors.Errorf(vtrpcpb.Code_INVALID_ARGUMENT, "exactly one ColumnVindex must be specified for the %s table",
+ tableName)
+ }
+
+ if tableName != targetTableName { // This is the source table.
+ sourceTableName = tableName
+ sourceTable = table
+ continue
+ }
+ // This is a primary vindex definition for the target table
+ // which allows you to override the vindex type used.
+ var vindexCols []string
+ if len(table.ColumnVindexes[0].Columns) != 0 {
+ vindexCols = table.ColumnVindexes[0].Columns
+ } else {
+ if table.ColumnVindexes[0].Column == "" {
+ return nil, "", vterrors.Errorf(vtrpcpb.Code_INVALID_ARGUMENT, "at least one column must be specified in ColumnVindexes for the %s table",
+ tableName)
+ }
+ vindexCols = []string{table.ColumnVindexes[0].Column}
+ }
+ if !slices.Equal(vindexCols, fromCols) {
+ return nil, "", vterrors.Errorf(vtrpcpb.Code_INVALID_ARGUMENT, "columns in the lookup table %s primary vindex (%s) don't match the 'from' columns specified (%s)",
+ tableName, strings.Join(vindexCols, ","), strings.Join(fromCols, ","))
+ }
+ }
+ return sourceTable, sourceTableName, nil
+}
+
+func (lv *lookupVindex) generateCreateDDLStatement(tableSchema *tabletmanagerdatapb.SchemaDefinition, sourceVindexColumns []string, vInfo *vindexInfo, vindex *vschemapb.Vindex) (string, error) {
+ lines := strings.Split(tableSchema.TableDefinitions[0].Schema, "\n")
+ if len(lines) < 3 {
+ // Should never happen.
+ return "", vterrors.Errorf(vtrpcpb.Code_INTERNAL, "schema looks incorrect: %s, expecting at least four lines",
+ tableSchema.TableDefinitions[0].Schema)
+ }
+
+ var modified []string
+ modified = append(modified, strings.Replace(lines[0], vInfo.sourceTableName, vInfo.targetTableName, 1))
+ for i := range sourceVindexColumns {
+ line, err := generateColDef(lines, sourceVindexColumns[i], vInfo.fromCols[i])
+ if err != nil {
+ return "", err
+ }
+ modified = append(modified, line)
+ }
+
+ if vindex.Params["data_type"] == "" || strings.EqualFold(vindex.Type, "consistent_lookup_unique") || strings.EqualFold(vindex.Type, "consistent_lookup") {
+ modified = append(modified, fmt.Sprintf(" %s varbinary(128),", sqlescape.EscapeID(vInfo.toCol)))
+ } else {
+ modified = append(modified, fmt.Sprintf(" %s %s,", sqlescape.EscapeID(vInfo.toCol), sqlescape.EscapeID(vindex.Params["data_type"])))
+ }
+
+ buf := sqlparser.NewTrackedBuffer(nil)
+ fmt.Fprintf(buf, " PRIMARY KEY (")
+ prefix := ""
+ for _, col := range vInfo.fromCols {
+ fmt.Fprintf(buf, "%s%s", prefix, sqlescape.EscapeID(col))
+ prefix = ", "
+ }
+ fmt.Fprintf(buf, ")")
+
+ modified = append(modified, buf.String())
+ modified = append(modified, ")")
+ createDDL := strings.Join(modified, "\n")
+
+ // Confirm that our DDL is valid before we create anything.
+ if _, err := lv.parser.ParseStrictDDL(createDDL); err != nil {
+ return "", vterrors.Errorf(vtrpcpb.Code_INTERNAL, "error: %v; invalid lookup table definition generated: %s",
+ err, createDDL)
+ }
+
+ return createDDL, nil
+}
+
+func generateMaterializeQuery(vInfo *vindexInfo, vindex *vschemapb.Vindex, sourceVindexColumns []string) string {
+ buf := sqlparser.NewTrackedBuffer(nil)
+ buf.Myprintf("select ")
+ for i := range vInfo.fromCols {
+ buf.Myprintf("%s as %s, ", sqlparser.String(sqlparser.NewIdentifierCI(sourceVindexColumns[i])), sqlparser.String(sqlparser.NewIdentifierCI(vInfo.fromCols[i])))
+ }
+ if strings.EqualFold(vInfo.toCol, "keyspace_id") || strings.EqualFold(vindex.Type, "consistent_lookup_unique") || strings.EqualFold(vindex.Type, "consistent_lookup") {
+ buf.Myprintf("keyspace_id() as %s ", sqlparser.String(sqlparser.NewIdentifierCI(vInfo.toCol)))
+ } else {
+ buf.Myprintf("%s as %s ", sqlparser.String(sqlparser.NewIdentifierCI(vInfo.toCol)), sqlparser.String(sqlparser.NewIdentifierCI(vInfo.toCol)))
+ }
+ buf.Myprintf("from %s", sqlparser.String(sqlparser.NewIdentifierCS(vInfo.sourceTableName)))
+ if vInfo.ignoreNulls {
+ buf.Myprintf(" where ")
+ lastValIdx := len(vInfo.fromCols) - 1
+ for i := range vInfo.fromCols {
+ buf.Myprintf("%s is not null", sqlparser.String(sqlparser.NewIdentifierCI(vInfo.fromCols[i])))
+ if i != lastValIdx {
+ buf.Myprintf(" and ")
+ }
+ }
+ }
+ if vindex.Owner != "" {
+ // Only backfill.
+ buf.Myprintf(" group by ")
+ for i := range vInfo.fromCols {
+ buf.Myprintf("%s, ", sqlparser.String(sqlparser.NewIdentifierCI(vInfo.fromCols[i])))
+ }
+ buf.Myprintf("%s", sqlparser.String(sqlparser.NewIdentifierCI(vInfo.toCol)))
+ }
+ return buf.String()
+}
+
+// validateSourceTableAndGetVindexColumns validates input table and vindex consistency, and returns sourceVindexColumns.
+func validateSourceTableAndGetVindexColumns(vInfo *vindexInfo, vindex *vschemapb.Vindex, keyspace string) (sourceVindexColumns []string, err error) {
+ if vInfo.sourceTable == nil || len(vInfo.sourceTable.ColumnVindexes) != 1 {
+ return nil, vterrors.Errorf(vtrpcpb.Code_INVALID_ARGUMENT, "No ColumnVindex found for the owner table (%s) in the %s keyspace",
+ vInfo.sourceTable, keyspace)
+ }
+ if vInfo.sourceTable.ColumnVindexes[0].Name != vInfo.name {
+ return nil,
+ vterrors.Errorf(vtrpcpb.Code_INVALID_ARGUMENT, "ColumnVindex name (%s) must match vindex name (%s)",
+ vInfo.sourceTable.ColumnVindexes[0].Name, vInfo.name)
+ }
+ if vindex.Owner != "" && vindex.Owner != vInfo.sourceTableName {
+ return nil, vterrors.Errorf(vtrpcpb.Code_INVALID_ARGUMENT, "vindex owner (%s) must match table name (%s)",
+ vindex.Owner, vInfo.sourceTableName)
+ }
+ if len(vInfo.sourceTable.ColumnVindexes[0].Columns) != 0 {
+ sourceVindexColumns = vInfo.sourceTable.ColumnVindexes[0].Columns
+ } else {
+ if vInfo.sourceTable.ColumnVindexes[0].Column == "" {
+ return nil, vterrors.Errorf(vtrpcpb.Code_INVALID_ARGUMENT, "at least one column must be specified in ColumnVindexes for the %s table",
+ vInfo.sourceTableName)
+ }
+ sourceVindexColumns = []string{vInfo.sourceTable.ColumnVindexes[0].Column}
+ }
+ if len(sourceVindexColumns) != len(vInfo.fromCols) {
+ return nil, vterrors.Errorf(vtrpcpb.Code_INVALID_ARGUMENT, "length of table columns (%d) differs from length of vindex columns (%d)",
+ len(sourceVindexColumns), len(vInfo.fromCols))
+ }
+
+ return sourceVindexColumns, nil
+}
+
+func validateNonConflictingColumnVindex(sourceVSchemaTable *vschemapb.Table, vInfo *vindexInfo, sourceVindexColumns []string, keyspace string) error {
+ for _, colVindex := range sourceVSchemaTable.ColumnVindexes {
+ // For a conflict, the vindex name and column should match.
+ if colVindex.Name != vInfo.name {
+ continue
+ }
+ var colNames []string
+ if len(colVindex.Columns) == 0 {
+ colNames = []string{colVindex.Column}
+ } else {
+ colNames = colVindex.Columns
+ }
+ // If this is the exact same definition then we can use the existing one. If they
+ // are not the same then they are two distinct conflicting vindexes and we should
+ // not proceed.
+ if !slices.Equal(colNames, sourceVindexColumns) {
+ return vterrors.Errorf(vtrpcpb.Code_INVALID_ARGUMENT, "a conflicting ColumnVindex on column(s) %s in table %s already exists in the %s keyspace",
+ strings.Join(colNames, ","), vInfo.sourceTableName, keyspace)
+ }
+ }
+ return nil
+}
+
+func generateColDef(lines []string, sourceVindexCol, vindexFromCol string) (string, error) {
+ source := sqlescape.EscapeID(sourceVindexCol)
+ target := sqlescape.EscapeID(vindexFromCol)
+
+ for _, line := range lines[1:] {
+ if strings.Contains(line, source) {
+ line = strings.Replace(line, source, target, 1)
+ line = strings.Replace(line, " AUTO_INCREMENT", "", 1)
+ line = strings.Replace(line, " DEFAULT NULL", "", 1)
+ // Ensure that the column definition ends with a comma as we will
+ // be appending the TO column and PRIMARY KEY definitions. If the
+ // souce column here was the last entity defined in the source
+ // table's definition then it will not already have the comma.
+ if !strings.HasSuffix(strings.TrimSpace(line), ",") {
+ line += ","
+ }
+ return line, nil
+ }
+ }
+ return "", fmt.Errorf("column %s not found in schema %v", sourceVindexCol, lines)
+}
diff --git a/go/vt/vtctl/workflow/materializer_test.go b/go/vt/vtctl/workflow/materializer_test.go
index a583a101186..e430f740c1f 100644
--- a/go/vt/vtctl/workflow/materializer_test.go
+++ b/go/vt/vtctl/workflow/materializer_test.go
@@ -1515,7 +1515,8 @@ func TestCreateLookupVindexCreateDDL(t *testing.T) {
setStartingVschema()
}()
}
- outms, _, _, cancelFunc, err := env.ws.prepareCreateLookup(ctx, "workflow", ms.SourceKeyspace, tcase.specs, false)
+ lv := newLookupVindex(env.ws)
+ outms, _, _, cancelFunc, err := lv.prepareCreate(ctx, "workflow", ms.SourceKeyspace, tcase.specs, false)
if tcase.err != "" {
require.Error(t, err)
require.Contains(t, err.Error(), tcase.err, "prepareCreateLookup(%s) err: %v, does not contain %v", tcase.description, err, tcase.err)
@@ -1763,7 +1764,8 @@ func TestCreateLookupVindexSourceVSchema(t *testing.T) {
t.Fatal(err)
}
- _, got, _, _, err := env.ws.prepareCreateLookup(ctx, "workflow", ms.SourceKeyspace, specs, false)
+ lv := newLookupVindex(env.ws)
+ _, got, _, _, err := lv.prepareCreate(ctx, "workflow", ms.SourceKeyspace, specs, false)
require.NoError(t, err)
if !proto.Equal(got, tcase.out) {
t.Errorf("%s: got:\n%v, want\n%v", tcase.description, got, tcase.out)
@@ -1984,32 +1986,35 @@ func TestCreateLookupVindexTargetVSchema(t *testing.T) {
err: "type SET is not recommended for a vindex",
}}
for _, tcase := range testcases {
- env.tmc.schema[ms.SourceKeyspace+".t1"] = &tabletmanagerdatapb.SchemaDefinition{
- TableDefinitions: []*tabletmanagerdatapb.TableDefinition{{
- Fields: []*querypb.Field{{
- Name: "col2",
- Type: tcase.sourceFieldType,
+ t.Run(tcase.description, func(t *testing.T) {
+ env.tmc.schema[ms.SourceKeyspace+".t1"] = &tabletmanagerdatapb.SchemaDefinition{
+ TableDefinitions: []*tabletmanagerdatapb.TableDefinition{{
+ Fields: []*querypb.Field{{
+ Name: "col2",
+ Type: tcase.sourceFieldType,
+ }},
+ Schema: sourceSchema,
}},
- Schema: sourceSchema,
- }},
- }
- specs.Vindexes["v"].Params["table"] = fmt.Sprintf("%s.%s", ms.TargetKeyspace, tcase.targetTable)
- if err := env.topoServ.SaveVSchema(ctx, ms.TargetKeyspace, tcase.targetVSchema); err != nil {
- t.Fatal(err)
- }
+ }
+ specs.Vindexes["v"].Params["table"] = fmt.Sprintf("%s.%s", ms.TargetKeyspace, tcase.targetTable)
+ if err := env.topoServ.SaveVSchema(ctx, ms.TargetKeyspace, tcase.targetVSchema); err != nil {
+ t.Fatal(err)
+ }
- _, _, got, cancelFunc, err := env.ws.prepareCreateLookup(ctx, "workflow", ms.SourceKeyspace, specs, false)
- if tcase.err != "" {
- if err == nil || !strings.Contains(err.Error(), tcase.err) {
- t.Errorf("prepareCreateLookup(%s) err: %v, must contain %v", tcase.description, err, tcase.err)
+ lv := newLookupVindex(env.ws)
+ _, _, got, cancelFunc, err := lv.prepareCreate(ctx, "workflow", ms.SourceKeyspace, specs, false)
+ if tcase.err != "" {
+ if err == nil || !strings.Contains(err.Error(), tcase.err) {
+ t.Errorf("prepareCreateLookup(%s) err: %v, must contain %v", tcase.description, err, tcase.err)
+ }
+ return
}
- continue
- }
- require.NoError(t, err)
- // withTable is a vschema that already contains the table and thus
- // we don't make any vschema changes and there's nothing to cancel.
- require.True(t, (cancelFunc != nil) == (tcase.targetVSchema != withTable))
- utils.MustMatch(t, tcase.out, got, tcase.description)
+ require.NoError(t, err)
+ // withTable is a vschema that already contains the table and thus
+ // we don't make any vschema changes and there's nothing to cancel.
+ require.True(t, (cancelFunc != nil) == (tcase.targetVSchema != withTable))
+ utils.MustMatch(t, tcase.out, got, tcase.description)
+ })
}
}
@@ -2119,7 +2124,8 @@ func TestCreateLookupVindexSameKeyspace(t *testing.T) {
t.Fatal(err)
}
- _, got, _, _, err := env.ws.prepareCreateLookup(ctx, "keyspace", ms.TargetKeyspace, specs, false)
+ lv := newLookupVindex(env.ws)
+ _, got, _, _, err := lv.prepareCreate(ctx, "keyspace", ms.TargetKeyspace, specs, false)
require.NoError(t, err)
if !proto.Equal(got, want) {
t.Errorf("same keyspace: got:\n%v, want\n%v", got, want)
@@ -2245,7 +2251,8 @@ func TestCreateCustomizedVindex(t *testing.T) {
t.Fatal(err)
}
- _, got, _, _, err := env.ws.prepareCreateLookup(ctx, "workflow", ms.TargetKeyspace, specs, false)
+ lv := newLookupVindex(env.ws)
+ _, got, _, _, err := lv.prepareCreate(ctx, "workflow", ms.TargetKeyspace, specs, false)
require.NoError(t, err)
if !proto.Equal(got, want) {
t.Errorf("customize create lookup error same: got:\n%v, want\n%v", got, want)
@@ -2363,7 +2370,8 @@ func TestCreateLookupVindexIgnoreNulls(t *testing.T) {
t.Fatal(err)
}
- ms, ks, _, _, err := env.ws.prepareCreateLookup(ctx, "workflow", ms.TargetKeyspace, specs, false)
+ lv := newLookupVindex(env.ws)
+ ms, ks, _, _, err := lv.prepareCreate(ctx, "workflow", ms.TargetKeyspace, specs, false)
require.NoError(t, err)
if !proto.Equal(wantKs, ks) {
t.Errorf("unexpected keyspace value: got:\n%v, want\n%v", ks, wantKs)
@@ -2443,11 +2451,12 @@ func TestStopAfterCopyFlag(t *testing.T) {
t.Fatal(err)
}
- ms1, _, _, _, err := env.ws.prepareCreateLookup(ctx, "workflow", ms.TargetKeyspace, specs, false)
+ lv := newLookupVindex(env.ws)
+ ms1, _, _, _, err := lv.prepareCreate(ctx, "workflow", ms.TargetKeyspace, specs, false)
require.NoError(t, err)
require.Equal(t, ms1.StopAfterCopy, true)
- ms2, _, _, _, err := env.ws.prepareCreateLookup(ctx, "workflow", ms.TargetKeyspace, specs, true)
+ ms2, _, _, _, err := lv.prepareCreate(ctx, "workflow", ms.TargetKeyspace, specs, true)
require.NoError(t, err)
require.Equal(t, ms2.StopAfterCopy, false)
}
diff --git a/go/vt/vtctl/workflow/server.go b/go/vt/vtctl/workflow/server.go
index baea602b7a4..8123416eb41 100644
--- a/go/vt/vtctl/workflow/server.go
+++ b/go/vt/vtctl/workflow/server.go
@@ -29,18 +29,15 @@ import (
"time"
"github.com/google/uuid"
- "golang.org/x/exp/maps"
"golang.org/x/sync/errgroup"
"golang.org/x/sync/semaphore"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
"google.golang.org/protobuf/encoding/prototext"
- "google.golang.org/protobuf/proto"
"vitess.io/vitess/go/constants/sidecar"
"vitess.io/vitess/go/protoutil"
"vitess.io/vitess/go/ptr"
- "vitess.io/vitess/go/sqlescape"
"vitess.io/vitess/go/sqltypes"
"vitess.io/vitess/go/trace"
"vitess.io/vitess/go/vt/concurrency"
@@ -49,7 +46,6 @@ import (
"vitess.io/vitess/go/vt/log"
"vitess.io/vitess/go/vt/logutil"
"vitess.io/vitess/go/vt/mysqlctl/tmutils"
- "vitess.io/vitess/go/vt/schema"
"vitess.io/vitess/go/vt/sqlparser"
"vitess.io/vitess/go/vt/topo"
"vitess.io/vitess/go/vt/topo/topoproto"
@@ -571,7 +567,9 @@ func (s *Server) LookupVindexCreate(ctx context.Context, req *vtctldatapb.Lookup
span.Annotate("cells", req.Cells)
span.Annotate("tablet_types", req.TabletTypes)
- ms, sourceVSchema, targetVSchema, cancelFunc, err := s.prepareCreateLookup(ctx, req.Workflow, req.Keyspace, req.Vindex, req.ContinueAfterCopyWithOwner)
+ lv := newLookupVindex(s)
+
+ ms, sourceVSchema, targetVSchema, cancelFunc, err := lv.prepareCreate(ctx, req.Workflow, req.Keyspace, req.Vindex, req.ContinueAfterCopyWithOwner)
if err != nil {
return nil, err
}
@@ -715,11 +713,8 @@ func (s *Server) Materialize(ctx context.Context, ms *vtctldatapb.MaterializeSet
cells[i] = strings.TrimSpace(cells[i])
}
- switch {
- case len(ms.ReferenceTables) == 0 && len(ms.TableSettings) == 0:
- return vterrors.Errorf(vtrpcpb.Code_FAILED_PRECONDITION, "either --table-settings or --reference-tables must be specified")
- case len(ms.ReferenceTables) > 0 && len(ms.TableSettings) > 0:
- return vterrors.Errorf(vtrpcpb.Code_FAILED_PRECONDITION, "cannot specify both --table-settings and --reference-tables")
+ if err := validateMaterializeSettings(ms); err != nil {
+ return err
}
for _, table := range ms.ReferenceTables {
@@ -746,6 +741,17 @@ func (s *Server) Materialize(ctx context.Context, ms *vtctldatapb.MaterializeSet
return mz.startStreams(ctx)
}
+func validateMaterializeSettings(ms *vtctldatapb.MaterializeSettings) error {
+ switch {
+ case len(ms.ReferenceTables) == 0 && len(ms.TableSettings) == 0:
+ return vterrors.Errorf(vtrpcpb.Code_FAILED_PRECONDITION, "either --table-settings or --reference-tables must be specified")
+ case len(ms.ReferenceTables) > 0 && len(ms.TableSettings) > 0:
+ return vterrors.Errorf(vtrpcpb.Code_FAILED_PRECONDITION, "cannot specify both --table-settings and --reference-tables")
+ }
+
+ return nil
+}
+
// MoveTablesCreate is part of the vtctlservicepb.VtctldServer interface.
// It passes the embedded TabletRequest object to the given keyspace's
// target primary tablets that will be executing the workflow.
@@ -3408,413 +3414,6 @@ func fillStringTemplate(tmpl string, vars any) (string, error) {
return data.String(), nil
}
-// prepareCreateLookup performs the preparatory steps for creating a
-// Lookup Vindex.
-func (s *Server) prepareCreateLookup(ctx context.Context, workflow, keyspace string, specs *vschemapb.Keyspace, continueAfterCopyWithOwner bool) (
- ms *vtctldatapb.MaterializeSettings, sourceVSchema, targetVSchema *vschemapb.Keyspace, cancelFunc func() error, err error) {
- // Important variables are pulled out here.
- var (
- vindexName string
- vindex *vschemapb.Vindex
- targetKeyspace string
- targetTableName string
- vindexFromCols []string
- vindexToCol string
- vindexIgnoreNulls bool
-
- sourceTableName string
- // sourceTable is the supplied table info.
- sourceTable *vschemapb.Table
- // sourceVSchemaTable is the table info present in the vschema.
- sourceVSchemaTable *vschemapb.Table
- // sourceVindexColumns are computed from the input sourceTable.
- sourceVindexColumns []string
-
- // Target table info.
- createDDL string
- materializeQuery string
- )
-
- // Validate input vindex.
- if specs == nil {
- return nil, nil, nil, nil, vterrors.Errorf(vtrpcpb.Code_INVALID_ARGUMENT, "no vindex provided")
- }
- if len(specs.Vindexes) != 1 {
- return nil, nil, nil, nil, vterrors.Errorf(vtrpcpb.Code_INVALID_ARGUMENT, "only one vindex must be specified")
- }
- vindexName = maps.Keys(specs.Vindexes)[0]
- vindex = maps.Values(specs.Vindexes)[0]
- if !strings.Contains(vindex.Type, "lookup") {
- return nil, nil, nil, nil, vterrors.Errorf(vtrpcpb.Code_INVALID_ARGUMENT, "vindex %s is not a lookup type", vindex.Type)
- }
- targetKeyspace, targetTableName, err = s.env.Parser().ParseTable(vindex.Params["table"])
- if err != nil || targetKeyspace == "" {
- return nil, nil, nil, nil, vterrors.Errorf(vtrpcpb.Code_INVALID_ARGUMENT, "vindex table name (%s) must be in the form .", vindex.Params["table"])
- }
- vindexFromCols = strings.Split(vindex.Params["from"], ",")
- for i, col := range vindexFromCols {
- vindexFromCols[i] = strings.TrimSpace(col)
- }
- if strings.Contains(vindex.Type, "unique") {
- if len(vindexFromCols) != 1 {
- return nil, nil, nil, nil, vterrors.Errorf(vtrpcpb.Code_INVALID_ARGUMENT, "unique vindex 'from' should have only one column")
- }
- }
- vindexToCol = vindex.Params["to"]
- // Make the vindex write_only. If one exists already in the vschema,
- // it will need to match this vindex exactly, including the write_only setting.
- vindex.Params["write_only"] = "true"
- // See if we can create the vindex without errors.
- if _, err := vindexes.CreateVindex(vindex.Type, vindexName, vindex.Params); err != nil {
- return nil, nil, nil, nil, err
- }
- if ignoreNullsStr, ok := vindex.Params["ignore_nulls"]; ok {
- // This mirrors the behavior of vindexes.boolFromMap().
- switch ignoreNullsStr {
- case "true":
- vindexIgnoreNulls = true
- case "false":
- vindexIgnoreNulls = false
- default:
- return nil, nil, nil, nil,
- vterrors.Errorf(vtrpcpb.Code_INVALID_ARGUMENT, "ignore_nulls (%s) value must be 'true' or 'false'",
- ignoreNullsStr)
- }
- }
-
- // Validate input table.
- if len(specs.Tables) < 1 || len(specs.Tables) > 2 {
- return nil, nil, nil, nil, fmt.Errorf("one or two tables must be specified")
- }
- // Loop executes once or twice.
- for tableName, table := range specs.Tables {
- if len(table.ColumnVindexes) != 1 {
- return nil, nil, nil, nil,
- vterrors.Errorf(vtrpcpb.Code_INVALID_ARGUMENT, "exactly one ColumnVindex must be specified for the %s table",
- tableName)
- }
- if tableName != targetTableName { // This is the source table.
- sourceTableName = tableName
- sourceTable = table
- continue
- }
- // This is a primary vindex definition for the target table
- // which allows you to override the vindex type used.
- var vindexCols []string
- if len(table.ColumnVindexes[0].Columns) != 0 {
- vindexCols = table.ColumnVindexes[0].Columns
- } else {
- if table.ColumnVindexes[0].Column == "" {
- return nil, nil, nil, nil,
- vterrors.Errorf(vtrpcpb.Code_INVALID_ARGUMENT, "at least one column must be specified in ColumnVindexes for the %s table",
- tableName)
- }
- vindexCols = []string{table.ColumnVindexes[0].Column}
- }
- if !slices.Equal(vindexCols, vindexFromCols) {
- return nil, nil, nil, nil,
- vterrors.Errorf(vtrpcpb.Code_INVALID_ARGUMENT, "columns in the lookup table %s primary vindex (%s) don't match the 'from' columns specified (%s)",
- tableName, strings.Join(vindexCols, ","), strings.Join(vindexFromCols, ","))
- }
- }
-
- // Validate input table and vindex consistency.
- if sourceTable == nil || len(sourceTable.ColumnVindexes) != 1 {
- return nil, nil, nil, nil,
- vterrors.Errorf(vtrpcpb.Code_INVALID_ARGUMENT, "No ColumnVindex found for the owner table (%s) in the %s keyspace",
- sourceTable, keyspace)
- }
- if sourceTable.ColumnVindexes[0].Name != vindexName {
- return nil, nil, nil, nil,
- vterrors.Errorf(vtrpcpb.Code_INVALID_ARGUMENT, "ColumnVindex name (%s) must match vindex name (%s)",
- sourceTable.ColumnVindexes[0].Name, vindexName)
- }
- if vindex.Owner != "" && vindex.Owner != sourceTableName {
- return nil, nil, nil, nil,
- vterrors.Errorf(vtrpcpb.Code_INVALID_ARGUMENT, "vindex owner (%s) must match table name (%s)",
- vindex.Owner, sourceTableName)
- }
- if len(sourceTable.ColumnVindexes[0].Columns) != 0 {
- sourceVindexColumns = sourceTable.ColumnVindexes[0].Columns
- } else {
- if sourceTable.ColumnVindexes[0].Column == "" {
- return nil, nil, nil, nil,
- vterrors.Errorf(vtrpcpb.Code_INVALID_ARGUMENT, "at least one column must be specified in ColumnVindexes for the %s table",
- sourceTableName)
- }
- sourceVindexColumns = []string{sourceTable.ColumnVindexes[0].Column}
- }
- if len(sourceVindexColumns) != len(vindexFromCols) {
- return nil, nil, nil, nil,
- vterrors.Errorf(vtrpcpb.Code_INVALID_ARGUMENT, "length of table columns (%d) differs from length of vindex columns (%d)",
- len(sourceVindexColumns), len(vindexFromCols))
- }
-
- // Validate against source vschema.
- sourceVSchema, err = s.ts.GetVSchema(ctx, keyspace)
- if err != nil {
- return nil, nil, nil, nil, err
- }
- if sourceVSchema.Vindexes == nil {
- sourceVSchema.Vindexes = make(map[string]*vschemapb.Vindex)
- }
- // If source and target keyspaces are the same, make vschemas point
- // to the same object.
- if keyspace == targetKeyspace {
- targetVSchema = sourceVSchema
- } else {
- targetVSchema, err = s.ts.GetVSchema(ctx, targetKeyspace)
- if err != nil {
- return nil, nil, nil, nil, err
- }
- }
- if targetVSchema.Vindexes == nil {
- targetVSchema.Vindexes = make(map[string]*vschemapb.Vindex)
- }
- if targetVSchema.Tables == nil {
- targetVSchema.Tables = make(map[string]*vschemapb.Table)
- }
- if existing, ok := sourceVSchema.Vindexes[vindexName]; ok {
- if !proto.Equal(existing, vindex) { // If the exact same vindex already exists then we can re-use it
- return nil, nil, nil, nil,
- vterrors.Errorf(vtrpcpb.Code_INTERNAL, "a conflicting vindex named %s already exists in the %s keyspace",
- vindexName, keyspace)
- }
- }
- sourceVSchemaTable = sourceVSchema.Tables[sourceTableName]
- if sourceVSchemaTable == nil && !schema.IsInternalOperationTableName(sourceTableName) {
- return nil, nil, nil, nil,
- vterrors.Errorf(vtrpcpb.Code_INTERNAL, "table %s not found in the %s keyspace", sourceTableName, keyspace)
- }
- for _, colVindex := range sourceVSchemaTable.ColumnVindexes {
- // For a conflict, the vindex name and column should match.
- if colVindex.Name != vindexName {
- continue
- }
- var colNames []string
- if len(colVindex.Columns) == 0 {
- colNames = []string{colVindex.Column}
- } else {
- colNames = colVindex.Columns
- }
- // If this is the exact same definition then we can use the existing one. If they
- // are not the same then they are two distinct conflicting vindexes and we should
- // not proceed.
- if !slices.Equal(colNames, sourceVindexColumns) {
- return nil, nil, nil, nil,
- vterrors.Errorf(vtrpcpb.Code_INVALID_ARGUMENT, "a conflicting ColumnVindex on column(s) %s in table %s already exists in the %s keyspace",
- strings.Join(colNames, ","), sourceTableName, keyspace)
- }
- }
-
- // Validate against source schema.
- sourceShards, err := s.ts.GetServingShards(ctx, keyspace)
- if err != nil {
- return nil, nil, nil, nil, err
- }
- onesource := sourceShards[0]
- if onesource.PrimaryAlias == nil {
- return nil, nil, nil, nil,
- vterrors.Errorf(vtrpcpb.Code_INTERNAL, "source shard %s has no primary", onesource.ShardName())
- }
- req := &tabletmanagerdatapb.GetSchemaRequest{Tables: []string{sourceTableName}}
- tableSchema, err := schematools.GetSchema(ctx, s.ts, s.tmc, onesource.PrimaryAlias, req)
- if err != nil {
- return nil, nil, nil, nil, err
- }
- if len(tableSchema.TableDefinitions) != 1 {
- return nil, nil, nil, nil,
- vterrors.Errorf(vtrpcpb.Code_INTERNAL, "unexpected number of tables (%d) returned from %s schema",
- len(tableSchema.TableDefinitions), keyspace)
- }
-
- // Generate "create table" statement.
- lines := strings.Split(tableSchema.TableDefinitions[0].Schema, "\n")
- if len(lines) < 3 {
- // Should never happen.
- return nil, nil, nil, nil,
- vterrors.Errorf(vtrpcpb.Code_INTERNAL, "schema looks incorrect: %s, expecting at least four lines",
- tableSchema.TableDefinitions[0].Schema)
- }
- var modified []string
- modified = append(modified, strings.Replace(lines[0], sourceTableName, targetTableName, 1))
- for i := range sourceVindexColumns {
- line, err := generateColDef(lines, sourceVindexColumns[i], vindexFromCols[i])
- if err != nil {
- return nil, nil, nil, nil, err
- }
- modified = append(modified, line)
- }
-
- if vindex.Params["data_type"] == "" || strings.EqualFold(vindex.Type, "consistent_lookup_unique") || strings.EqualFold(vindex.Type, "consistent_lookup") {
- modified = append(modified, fmt.Sprintf(" %s varbinary(128),", sqlescape.EscapeID(vindexToCol)))
- } else {
- modified = append(modified, fmt.Sprintf(" %s %s,", sqlescape.EscapeID(vindexToCol), sqlescape.EscapeID(vindex.Params["data_type"])))
- }
- buf := sqlparser.NewTrackedBuffer(nil)
- fmt.Fprintf(buf, " PRIMARY KEY (")
- prefix := ""
- for _, col := range vindexFromCols {
- fmt.Fprintf(buf, "%s%s", prefix, sqlescape.EscapeID(col))
- prefix = ", "
- }
- fmt.Fprintf(buf, ")")
- modified = append(modified, buf.String())
- modified = append(modified, ")")
- createDDL = strings.Join(modified, "\n")
- // Confirm that our DDL is valid before we create anything.
- if _, err = s.env.Parser().ParseStrictDDL(createDDL); err != nil {
- return nil, nil, nil, nil, vterrors.Errorf(vtrpcpb.Code_INTERNAL, "error: %v; invalid lookup table definition generated: %s",
- err, createDDL)
- }
-
- // Generate vreplication query.
- buf = sqlparser.NewTrackedBuffer(nil)
- buf.Myprintf("select ")
- for i := range vindexFromCols {
- buf.Myprintf("%s as %s, ", sqlparser.String(sqlparser.NewIdentifierCI(sourceVindexColumns[i])), sqlparser.String(sqlparser.NewIdentifierCI(vindexFromCols[i])))
- }
- if strings.EqualFold(vindexToCol, "keyspace_id") || strings.EqualFold(vindex.Type, "consistent_lookup_unique") || strings.EqualFold(vindex.Type, "consistent_lookup") {
- buf.Myprintf("keyspace_id() as %s ", sqlparser.String(sqlparser.NewIdentifierCI(vindexToCol)))
- } else {
- buf.Myprintf("%s as %s ", sqlparser.String(sqlparser.NewIdentifierCI(vindexToCol)), sqlparser.String(sqlparser.NewIdentifierCI(vindexToCol)))
- }
- buf.Myprintf("from %s", sqlparser.String(sqlparser.NewIdentifierCS(sourceTableName)))
- if vindexIgnoreNulls {
- buf.Myprintf(" where ")
- lastValIdx := len(vindexFromCols) - 1
- for i := range vindexFromCols {
- buf.Myprintf("%s is not null", sqlparser.String(sqlparser.NewIdentifierCI(vindexFromCols[i])))
- if i != lastValIdx {
- buf.Myprintf(" and ")
- }
- }
- }
- if vindex.Owner != "" {
- // Only backfill.
- buf.Myprintf(" group by ")
- for i := range vindexFromCols {
- buf.Myprintf("%s, ", sqlparser.String(sqlparser.NewIdentifierCI(vindexFromCols[i])))
- }
- buf.Myprintf("%s", sqlparser.String(sqlparser.NewIdentifierCI(vindexToCol)))
- }
- materializeQuery = buf.String()
-
- // Save a copy of the original vschema if we modify it and need to provide
- // a cancelFunc.
- ogTargetVSchema := targetVSchema.CloneVT()
- targetChanged := false
-
- // Update targetVSchema.
- targetTable := specs.Tables[targetTableName]
- if targetVSchema.Sharded {
- // Choose a primary vindex type for the lookup table based on the source
- // definition if one was not explicitly specified.
- var targetVindexType string
- var targetVindex *vschemapb.Vindex
- for _, field := range tableSchema.TableDefinitions[0].Fields {
- if sourceVindexColumns[0] == field.Name {
- if targetTable != nil && len(targetTable.ColumnVindexes) > 0 {
- targetVindexType = targetTable.ColumnVindexes[0].Name
- }
- if targetVindexType == "" {
- targetVindexType, err = vindexes.ChooseVindexForType(field.Type)
- if err != nil {
- return nil, nil, nil, nil, err
- }
- }
- targetVindex = &vschemapb.Vindex{
- Type: targetVindexType,
- }
- break
- }
- }
- if targetVindex == nil {
- // Unreachable. We validated column names when generating the DDL.
- return nil, nil, nil, nil,
- vterrors.Errorf(vtrpcpb.Code_INTERNAL, "column %s not found in target schema %s",
- sourceVindexColumns[0], tableSchema.TableDefinitions[0].Schema)
- }
- if existing, ok := targetVSchema.Vindexes[targetVindexType]; ok {
- if !proto.Equal(existing, targetVindex) {
- return nil, nil, nil, nil,
- vterrors.Errorf(vtrpcpb.Code_INVALID_ARGUMENT, "a conflicting vindex named %v already exists in the %s keyspace",
- targetVindexType, targetKeyspace)
- }
- } else {
- targetVSchema.Vindexes[targetVindexType] = targetVindex
- targetChanged = true
- }
-
- targetTable = &vschemapb.Table{
- ColumnVindexes: []*vschemapb.ColumnVindex{{
- Column: vindexFromCols[0],
- Name: targetVindexType,
- }},
- }
- } else {
- targetTable = &vschemapb.Table{}
- }
- if existing, ok := targetVSchema.Tables[targetTableName]; ok {
- if !proto.Equal(existing, targetTable) {
- return nil, nil, nil, nil,
- vterrors.Errorf(vtrpcpb.Code_INVALID_ARGUMENT, "a conflicting table named %s already exists in the %s vschema",
- targetTableName, targetKeyspace)
- }
- } else {
- targetVSchema.Tables[targetTableName] = targetTable
- targetChanged = true
- }
-
- if targetChanged {
- cancelFunc = func() error {
- // Restore the original target vschema.
- return s.ts.SaveVSchema(ctx, targetKeyspace, ogTargetVSchema)
- }
- }
-
- ms = &vtctldatapb.MaterializeSettings{
- Workflow: workflow,
- MaterializationIntent: vtctldatapb.MaterializationIntent_CREATELOOKUPINDEX,
- SourceKeyspace: keyspace,
- TargetKeyspace: targetKeyspace,
- StopAfterCopy: vindex.Owner != "" && !continueAfterCopyWithOwner,
- TableSettings: []*vtctldatapb.TableMaterializeSettings{{
- TargetTable: targetTableName,
- SourceExpression: materializeQuery,
- CreateDdl: createDDL,
- }},
- }
-
- // Update sourceVSchema
- sourceVSchema.Vindexes[vindexName] = vindex
- sourceVSchemaTable.ColumnVindexes = append(sourceVSchemaTable.ColumnVindexes, sourceTable.ColumnVindexes[0])
-
- return ms, sourceVSchema, targetVSchema, cancelFunc, nil
-}
-
-func generateColDef(lines []string, sourceVindexCol, vindexFromCol string) (string, error) {
- source := sqlescape.EscapeID(sourceVindexCol)
- target := sqlescape.EscapeID(vindexFromCol)
-
- for _, line := range lines[1:] {
- if strings.Contains(line, source) {
- line = strings.Replace(line, source, target, 1)
- line = strings.Replace(line, " AUTO_INCREMENT", "", 1)
- line = strings.Replace(line, " DEFAULT NULL", "", 1)
- // Ensure that the column definition ends with a comma as we will
- // be appending the TO column and PRIMARY KEY definitions. If the
- // souce column here was the last entity defined in the source
- // table's definition then it will not already have the comma.
- if !strings.HasSuffix(strings.TrimSpace(line), ",") {
- line += ","
- }
- return line, nil
- }
- }
- return "", fmt.Errorf("column %s not found in schema %v", sourceVindexCol, lines)
-}
-
func (s *Server) MigrateCreate(ctx context.Context, req *vtctldatapb.MigrateCreateRequest) (*vtctldatapb.WorkflowStatusResponse, error) {
moveTablesCreateRequest := &vtctldatapb.MoveTablesCreateRequest{
Workflow: req.Workflow,
diff --git a/go/vt/vtctl/workflow/vdiff.go b/go/vt/vtctl/workflow/vdiff.go
new file mode 100644
index 00000000000..6be5fe3c3b5
--- /dev/null
+++ b/go/vt/vtctl/workflow/vdiff.go
@@ -0,0 +1,280 @@
+/*
+Copyright 2024 The Vitess Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package workflow
+
+import (
+ "encoding/json"
+ "math"
+ "sort"
+ "strings"
+ "time"
+
+ "vitess.io/vitess/go/sqltypes"
+ "vitess.io/vitess/go/vt/vttablet/tabletmanager/vdiff"
+
+ vtctldatapb "vitess.io/vitess/go/vt/proto/vtctldata"
+)
+
+// TableSummary aggregates the current state of the table diff from all shards.
+type TableSummary struct {
+ TableName string
+ State vdiff.VDiffState
+ RowsCompared int64
+ MatchingRows int64
+ MismatchedRows int64
+ ExtraRowsSource int64
+ ExtraRowsTarget int64
+ LastUpdated string `json:"LastUpdated,omitempty"`
+}
+
+// Summary aggregates the current state of the vdiff from all shards.
+type Summary struct {
+ Workflow, Keyspace string
+ State vdiff.VDiffState
+ UUID string
+ RowsCompared int64
+ HasMismatch bool
+ Shards string
+ StartedAt string `json:"StartedAt,omitempty"`
+ CompletedAt string `json:"CompletedAt,omitempty"`
+ TableSummaryMap map[string]TableSummary `json:"TableSummary,omitempty"`
+ // This is keyed by table name and then by shard name.
+ Reports map[string]map[string]vdiff.DiffReport `json:"Reports,omitempty"`
+ // This is keyed by shard name.
+ Errors map[string]string `json:"Errors,omitempty"`
+ Progress *vdiff.ProgressReport `json:"Progress,omitempty"`
+}
+
+// BuildSummary generates a summary from a vdiff show response.
+func BuildSummary(keyspace, workflow, uuid string, resp *vtctldatapb.VDiffShowResponse, verbose bool) (*Summary, error) {
+ summary := &Summary{
+ Workflow: workflow,
+ Keyspace: keyspace,
+ UUID: uuid,
+ State: vdiff.UnknownState,
+ RowsCompared: 0,
+ StartedAt: "",
+ CompletedAt: "",
+ HasMismatch: false,
+ Shards: "",
+ Reports: make(map[string]map[string]vdiff.DiffReport),
+ Errors: make(map[string]string),
+ Progress: nil,
+ }
+
+ var tableSummaryMap map[string]TableSummary
+ var reports map[string]map[string]vdiff.DiffReport
+ // Keep a tally of the states across all tables in all shards.
+ tableStateCounts := map[vdiff.VDiffState]int{
+ vdiff.UnknownState: 0,
+ vdiff.PendingState: 0,
+ vdiff.StartedState: 0,
+ vdiff.StoppedState: 0,
+ vdiff.ErrorState: 0,
+ vdiff.CompletedState: 0,
+ }
+ // Keep a tally of the summary states across all shards.
+ shardStateCounts := map[vdiff.VDiffState]int{
+ vdiff.UnknownState: 0,
+ vdiff.PendingState: 0,
+ vdiff.StartedState: 0,
+ vdiff.StoppedState: 0,
+ vdiff.ErrorState: 0,
+ vdiff.CompletedState: 0,
+ }
+ // Keep a tally of the approximate total rows to process as we'll use this for our progress
+ // report.
+ totalRowsToCompare := int64(0)
+ var shards []string
+ for shard, resp := range resp.TabletResponses {
+ first := true
+ if resp != nil && resp.Output != nil {
+ shards = append(shards, shard)
+ qr := sqltypes.Proto3ToResult(resp.Output)
+ if tableSummaryMap == nil {
+ tableSummaryMap = make(map[string]TableSummary, 0)
+ reports = make(map[string]map[string]vdiff.DiffReport, 0)
+ }
+ for _, row := range qr.Named().Rows {
+ // Update the global VDiff summary based on the per shard level summary.
+ // Since these values will be the same for all subsequent rows we only use
+ // the first row.
+ if first {
+ first = false
+ // Our timestamps are strings in `2022-06-26 20:43:25` format so we sort
+ // them lexicographically.
+ // We should use the earliest started_at across all shards.
+ if sa := row.AsString("started_at", ""); summary.StartedAt == "" || sa < summary.StartedAt {
+ summary.StartedAt = sa
+ }
+ // And we should use the latest completed_at across all shards.
+ if ca := row.AsString("completed_at", ""); summary.CompletedAt == "" || ca > summary.CompletedAt {
+ summary.CompletedAt = ca
+ }
+ // If we had an error on the shard, then let's add that to the summary.
+ if le := row.AsString("last_error", ""); le != "" {
+ summary.Errors[shard] = le
+ }
+ // Keep track of how many shards are marked as a specific state. We check
+ // this combined with the shard.table states to determine the VDiff summary
+ // state.
+ shardStateCounts[vdiff.VDiffState(strings.ToLower(row.AsString("vdiff_state", "")))]++
+ }
+
+ // Global VDiff summary updates that take into account the per table details
+ // per shard.
+ {
+ summary.RowsCompared += row.AsInt64("rows_compared", 0)
+ totalRowsToCompare += row.AsInt64("table_rows", 0)
+
+ // If we had a mismatch on any table on any shard then the global VDiff
+ // summary does too.
+ if mm, _ := row.ToBool("has_mismatch"); mm {
+ summary.HasMismatch = true
+ }
+ }
+
+ // Table summary information that must be accounted for across all shards.
+ {
+ table := row.AsString("table_name", "")
+ if table == "" { // This occurs when the table diff has not started on 1 or more shards
+ continue
+ }
+ // Create the global VDiff table summary object if it doesn't exist.
+ if _, ok := tableSummaryMap[table]; !ok {
+ tableSummaryMap[table] = TableSummary{
+ TableName: table,
+ State: vdiff.UnknownState,
+ }
+
+ }
+ ts := tableSummaryMap[table]
+ // This is the shard level VDiff table state.
+ sts := vdiff.VDiffState(strings.ToLower(row.AsString("table_state", "")))
+ tableStateCounts[sts]++
+
+ // The error state must be sticky, and we should not override any other
+ // known state with completed.
+ switch sts {
+ case vdiff.CompletedState:
+ if ts.State == vdiff.UnknownState {
+ ts.State = sts
+ }
+ case vdiff.ErrorState:
+ ts.State = sts
+ default:
+ if ts.State != vdiff.ErrorState {
+ ts.State = sts
+ }
+ }
+
+ diffReport := row.AsString("report", "")
+ dr := vdiff.DiffReport{}
+ if diffReport != "" {
+ err := json.Unmarshal([]byte(diffReport), &dr)
+ if err != nil {
+ return nil, err
+ }
+ ts.RowsCompared += dr.ProcessedRows
+ ts.MismatchedRows += dr.MismatchedRows
+ ts.MatchingRows += dr.MatchingRows
+ ts.ExtraRowsTarget += dr.ExtraRowsTarget
+ ts.ExtraRowsSource += dr.ExtraRowsSource
+ }
+ if _, ok := reports[table]; !ok {
+ reports[table] = make(map[string]vdiff.DiffReport)
+ }
+
+ reports[table][shard] = dr
+ tableSummaryMap[table] = ts
+ }
+ }
+ }
+ }
+
+ // The global VDiff summary should progress from pending->started->completed with
+ // stopped for any shard and error for any table being sticky for the global summary.
+ // We should only consider the VDiff to be complete if it's completed for every table
+ // on every shard.
+ if shardStateCounts[vdiff.StoppedState] > 0 {
+ summary.State = vdiff.StoppedState
+ } else if shardStateCounts[vdiff.ErrorState] > 0 || tableStateCounts[vdiff.ErrorState] > 0 {
+ summary.State = vdiff.ErrorState
+ } else if tableStateCounts[vdiff.StartedState] > 0 {
+ summary.State = vdiff.StartedState
+ } else if tableStateCounts[vdiff.PendingState] > 0 {
+ summary.State = vdiff.PendingState
+ } else if tableStateCounts[vdiff.CompletedState] == (len(tableSummaryMap) * len(shards)) {
+ // When doing shard consolidations/merges, we cannot rely solely on the
+ // vdiff_table state as there are N sources that we process rows from sequentially
+ // with each one writing to the shared _vt.vdiff_table record for the target shard.
+ // So we only mark the vdiff for the shard as completed when we've finished
+ // processing rows from all of the sources -- which is recorded by marking the
+ // vdiff done for the shard by setting _vt.vdiff.state = completed.
+ if shardStateCounts[vdiff.CompletedState] == len(shards) {
+ summary.State = vdiff.CompletedState
+ } else {
+ summary.State = vdiff.StartedState
+ }
+ } else {
+ summary.State = vdiff.UnknownState
+ }
+
+ // If the vdiff has been started then we can calculate the progress.
+ if summary.State == vdiff.StartedState {
+ summary.Progress = BuildProgressReport(summary.RowsCompared, totalRowsToCompare, summary.StartedAt)
+ }
+
+ sort.Strings(shards) // Sort for predictable output
+ summary.Shards = strings.Join(shards, ",")
+ summary.TableSummaryMap = tableSummaryMap
+ summary.Reports = reports
+ if !summary.HasMismatch && !verbose {
+ summary.Reports = nil
+ summary.TableSummaryMap = nil
+ }
+ // If we haven't completed the global VDiff then be sure to reflect that with no
+ // CompletedAt value.
+ if summary.State != vdiff.CompletedState {
+ summary.CompletedAt = ""
+ }
+ return summary, nil
+}
+
+func BuildProgressReport(rowsCompared int64, rowsToCompare int64, startedAt string) *vdiff.ProgressReport {
+ report := &vdiff.ProgressReport{}
+ if rowsCompared >= 1 {
+ // Round to 2 decimal points.
+ report.Percentage = math.Round(math.Min((float64(rowsCompared)/float64(rowsToCompare))*100, 100.00)*100) / 100
+ }
+ if math.IsNaN(report.Percentage) {
+ report.Percentage = 0
+ }
+ pctToGo := math.Abs(report.Percentage - 100.00)
+ startTime, _ := time.Parse(vdiff.TimestampFormat, startedAt)
+ curTime := time.Now().UTC()
+ runTime := curTime.Unix() - startTime.Unix()
+ if report.Percentage >= 1 {
+ // Calculate how long 1% took, on avg, and multiply that by the % left.
+ eta := time.Unix(((int64(runTime)/int64(report.Percentage))*int64(pctToGo))+curTime.Unix(), 1).UTC()
+ // Cap the ETA at 1 year out to prevent providing nonsensical ETAs.
+ if eta.Before(time.Now().UTC().AddDate(1, 0, 0)) {
+ report.ETA = eta.Format(vdiff.TimestampFormat)
+ }
+ }
+ return report
+}
diff --git a/go/vt/vtctl/workflow/vdiff_test.go b/go/vt/vtctl/workflow/vdiff_test.go
new file mode 100644
index 00000000000..e5578afc170
--- /dev/null
+++ b/go/vt/vtctl/workflow/vdiff_test.go
@@ -0,0 +1,136 @@
+/*
+Copyright 2024 The Vitess Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package workflow
+
+import (
+ "math"
+ "testing"
+ "time"
+
+ "github.com/stretchr/testify/require"
+
+ "vitess.io/vitess/go/vt/vttablet/tabletmanager/vdiff"
+)
+
+func TestBuildProgressReport(t *testing.T) {
+ now := time.Now()
+ type args struct {
+ summary *Summary
+ rowsToCompare int64
+ }
+ tests := []struct {
+ name string
+ args args
+ want *vdiff.ProgressReport
+ }{
+ {
+ name: "no progress",
+ args: args{
+ summary: &Summary{RowsCompared: 0},
+ rowsToCompare: 100,
+ },
+ want: &vdiff.ProgressReport{
+ Percentage: 0,
+ ETA: "", // no ETA
+ },
+ },
+ {
+ name: "one third of the way",
+ args: args{
+ summary: &Summary{
+ RowsCompared: 33,
+ StartedAt: now.Add(-10 * time.Second).UTC().Format(vdiff.TimestampFormat),
+ },
+ rowsToCompare: 100,
+ },
+ want: &vdiff.ProgressReport{
+ Percentage: 33,
+ ETA: now.Add(20 * time.Second).UTC().Format(vdiff.TimestampFormat),
+ },
+ },
+ {
+ name: "half way",
+ args: args{
+ summary: &Summary{
+ RowsCompared: 5000000000,
+ StartedAt: now.Add(-10 * time.Hour).UTC().Format(vdiff.TimestampFormat),
+ },
+ rowsToCompare: 10000000000,
+ },
+ want: &vdiff.ProgressReport{
+ Percentage: 50,
+ ETA: now.Add(10 * time.Hour).UTC().Format(vdiff.TimestampFormat),
+ },
+ },
+ {
+ name: "full progress",
+ args: args{
+ summary: &Summary{
+ RowsCompared: 100,
+ CompletedAt: now.UTC().Format(vdiff.TimestampFormat),
+ },
+ rowsToCompare: 100,
+ },
+ want: &vdiff.ProgressReport{
+ Percentage: 100,
+ ETA: now.UTC().Format(vdiff.TimestampFormat),
+ },
+ },
+ {
+ name: "more than in I_S",
+ args: args{
+ summary: &Summary{
+ RowsCompared: 100,
+ CompletedAt: now.UTC().Format(vdiff.TimestampFormat),
+ },
+ rowsToCompare: 50,
+ },
+ want: &vdiff.ProgressReport{
+ Percentage: 100,
+ ETA: now.UTC().Format(vdiff.TimestampFormat),
+ },
+ },
+ }
+ for _, tt := range tests {
+ t.Run(tt.name, func(t *testing.T) {
+ tt.args.summary.Progress = BuildProgressReport(tt.args.summary.RowsCompared, tt.args.rowsToCompare, tt.args.summary.StartedAt)
+ // We always check the percentage
+ require.Equal(t, int(tt.want.Percentage), int(tt.args.summary.Progress.Percentage))
+
+ // We only check the ETA if there is one.
+ if tt.want.ETA != "" {
+ // Let's check that we're within 1 second to avoid flakes.
+ wantTime, err := time.Parse(vdiff.TimestampFormat, tt.want.ETA)
+ require.NoError(t, err)
+ var timeDiff float64
+ if tt.want.Percentage == 100 {
+ completedTime, err := time.Parse(vdiff.TimestampFormat, tt.args.summary.CompletedAt)
+ require.NoError(t, err)
+ timeDiff = math.Abs(completedTime.Sub(wantTime).Seconds())
+ } else {
+ startTime, err := time.Parse(vdiff.TimestampFormat, tt.args.summary.StartedAt)
+ require.NoError(t, err)
+ completedTimeUnix := float64(now.UTC().Unix()-startTime.UTC().Unix()) * (100 / tt.want.Percentage)
+ estimatedTime, err := time.Parse(vdiff.TimestampFormat, tt.want.ETA)
+ require.NoError(t, err)
+ timeDiff = math.Abs(estimatedTime.Sub(startTime).Seconds() - completedTimeUnix)
+ }
+ require.LessOrEqual(t, timeDiff, 1.0)
+ }
+ })
+ }
+}
diff --git a/go/vt/vterrors/code.go b/go/vt/vterrors/code.go
index 31c98cef280..0ca275b71fc 100644
--- a/go/vt/vterrors/code.go
+++ b/go/vt/vterrors/code.go
@@ -102,6 +102,7 @@ var (
VT09028 = errorWithState("VT09028", vtrpcpb.Code_FAILED_PRECONDITION, CTERecursiveForbiddenJoinOrder, "In recursive query block of Recursive Common Table Expression '%s', the recursive table must neither be in the right argument of a LEFT JOIN, nor be forced to be non-first with join order hints", "")
VT09029 = errorWithState("VT09029", vtrpcpb.Code_FAILED_PRECONDITION, CTERecursiveRequiresSingleReference, "In recursive query block of Recursive Common Table Expression %s, the recursive table must be referenced only once, and not in any subquery", "")
VT09030 = errorWithState("VT09030", vtrpcpb.Code_FAILED_PRECONDITION, CTEMaxRecursionDepth, "Recursive query aborted after 1000 iterations.", "")
+ VT09031 = errorWithoutState("VT09031", vtrpcpb.Code_FAILED_PRECONDITION, "Primary demotion is stalled", "")
VT10001 = errorWithoutState("VT10001", vtrpcpb.Code_ABORTED, "foreign key constraints are not allowed", "Foreign key constraints are not allowed, see https://vitess.io/blog/2021-06-15-online-ddl-why-no-fk/.")
VT10002 = errorWithoutState("VT10002", vtrpcpb.Code_ABORTED, "atomic distributed transaction not allowed: %s", "The distributed transaction cannot be committed. A rollback decision is taken.")
@@ -192,6 +193,8 @@ var (
VT09027,
VT09028,
VT09029,
+ VT09030,
+ VT09031,
VT10001,
VT10002,
VT12001,
diff --git a/go/vt/vtgate/engine/cached_size.go b/go/vt/vtgate/engine/cached_size.go
index c764a6aab08..e59832cdab5 100644
--- a/go/vt/vtgate/engine/cached_size.go
+++ b/go/vt/vtgate/engine/cached_size.go
@@ -465,7 +465,7 @@ func (cached *Insert) CachedSize(alloc bool) int64 {
}
size := int64(0)
if alloc {
- size += int64(224)
+ size += int64(240)
}
// field InsertCommon vitess.io/vitess/go/vt/vtgate/engine.InsertCommon
size += cached.InsertCommon.CachedSize(false)
@@ -546,7 +546,7 @@ func (cached *InsertSelect) CachedSize(alloc bool) int64 {
}
size := int64(0)
if alloc {
- size += int64(176)
+ size += int64(192)
}
// field InsertCommon vitess.io/vitess/go/vt/vtgate/engine.InsertCommon
size += cached.InsertCommon.CachedSize(false)
@@ -609,7 +609,7 @@ func (cached *Limit) CachedSize(alloc bool) int64 {
}
size := int64(0)
if alloc {
- size += int64(48)
+ size += int64(64)
}
// field Count vitess.io/vitess/go/vt/vtgate/evalengine.Expr
if cc, ok := cached.Count.(cachedObject); ok {
diff --git a/go/vt/vtgate/engine/dbddl.go b/go/vt/vtgate/engine/dbddl.go
index 7783e6bdc12..152894d5eab 100644
--- a/go/vt/vtgate/engine/dbddl.go
+++ b/go/vt/vtgate/engine/dbddl.go
@@ -145,7 +145,7 @@ func (c *DBDDL) createDatabase(ctx context.Context, vcursor VCursor, plugin DBDD
}
for {
- _, errors := vcursor.ExecuteMultiShard(ctx, c, destinations, queries, false, true)
+ _, errors := vcursor.ExecuteMultiShard(ctx, c, destinations, queries, false, true, false)
noErr := true
for _, err := range errors {
diff --git a/go/vt/vtgate/engine/delete.go b/go/vt/vtgate/engine/delete.go
index 91bcca5cf6a..14859fc2135 100644
--- a/go/vt/vtgate/engine/delete.go
+++ b/go/vt/vtgate/engine/delete.go
@@ -87,7 +87,7 @@ func (del *Delete) deleteVindexEntries(ctx context.Context, vcursor VCursor, bin
for i := range rss {
queries[i] = &querypb.BoundQuery{Sql: del.OwnedVindexQuery, BindVariables: bindVars}
}
- subQueryResults, errors := vcursor.ExecuteMultiShard(ctx, del, rss, queries, false /* rollbackOnError */, false /* canAutocommit */)
+ subQueryResults, errors := vcursor.ExecuteMultiShard(ctx, del, rss, queries, false /*rollbackOnError*/, false /*canAutocommit*/, del.FetchLastInsertID)
for _, err := range errors {
if err != nil {
return err
@@ -131,6 +131,9 @@ func (del *Delete) description() PrimitiveDescription {
}
addFieldsIfNotEmpty(del.DML, other)
+ if del.FetchLastInsertID {
+ other["FetchLastInsertID"] = del.FetchLastInsertID
+ }
return PrimitiveDescription{
OperatorType: "Delete",
diff --git a/go/vt/vtgate/engine/dml.go b/go/vt/vtgate/engine/dml.go
index db777c36698..9a0a044a3c4 100644
--- a/go/vt/vtgate/engine/dml.go
+++ b/go/vt/vtgate/engine/dml.go
@@ -65,6 +65,8 @@ type DML struct {
PreventAutoCommit bool
+ FetchLastInsertID bool
+
// RoutingParameters parameters required for query routing.
*RoutingParameters
}
@@ -75,7 +77,7 @@ func NewDML() *DML {
}
func (dml *DML) execUnsharded(ctx context.Context, primitive Primitive, vcursor VCursor, bindVars map[string]*querypb.BindVariable, rss []*srvtopo.ResolvedShard) (*sqltypes.Result, error) {
- return execShard(ctx, primitive, vcursor, dml.Query, bindVars, rss[0], true /* rollbackOnError */, !dml.PreventAutoCommit /* canAutocommit */)
+ return execShard(ctx, primitive, vcursor, dml.Query, bindVars, rss[0], true /* rollbackOnError */, !dml.PreventAutoCommit /* canAutocommit */, dml.FetchLastInsertID)
}
func (dml *DML) execMultiDestination(ctx context.Context, primitive Primitive, vcursor VCursor, bindVars map[string]*querypb.BindVariable, rss []*srvtopo.ResolvedShard, dmlSpecialFunc func(context.Context, VCursor,
@@ -94,7 +96,7 @@ func (dml *DML) execMultiDestination(ctx context.Context, primitive Primitive, v
BindVariables: bvs[i],
}
}
- return execMultiShard(ctx, primitive, vcursor, rss, queries, dml.MultiShardAutocommit)
+ return dml.execMultiShard(ctx, primitive, vcursor, rss, queries)
}
// RouteType returns a description of the query routing type used by the primitive
@@ -130,9 +132,9 @@ func allowOnlyPrimary(rss ...*srvtopo.ResolvedShard) error {
return nil
}
-func execMultiShard(ctx context.Context, primitive Primitive, vcursor VCursor, rss []*srvtopo.ResolvedShard, queries []*querypb.BoundQuery, multiShardAutoCommit bool) (*sqltypes.Result, error) {
- autocommit := (len(rss) == 1 || multiShardAutoCommit) && vcursor.AutocommitApproval()
- result, errs := vcursor.ExecuteMultiShard(ctx, primitive, rss, queries, true /* rollbackOnError */, autocommit)
+func (dml *DML) execMultiShard(ctx context.Context, primitive Primitive, vcursor VCursor, rss []*srvtopo.ResolvedShard, queries []*querypb.BoundQuery) (*sqltypes.Result, error) {
+ autocommit := (len(rss) == 1 || dml.MultiShardAutocommit) && vcursor.AutocommitApproval()
+ result, errs := vcursor.ExecuteMultiShard(ctx, primitive, rss, queries, true /*rollbackOnError*/, autocommit, dml.FetchLastInsertID)
return result, vterrors.Aggregate(errs)
}
diff --git a/go/vt/vtgate/engine/fake_vcursor_test.go b/go/vt/vtgate/engine/fake_vcursor_test.go
index 9ba4fdc6a6b..f27ca380876 100644
--- a/go/vt/vtgate/engine/fake_vcursor_test.go
+++ b/go/vt/vtgate/engine/fake_vcursor_test.go
@@ -368,7 +368,7 @@ func (t *noopVCursor) Execute(ctx context.Context, method string, query string,
panic("unimplemented")
}
-func (t *noopVCursor) ExecuteMultiShard(ctx context.Context, primitive Primitive, rss []*srvtopo.ResolvedShard, queries []*querypb.BoundQuery, rollbackOnError, canAutocommit bool) (*sqltypes.Result, []error) {
+func (t *noopVCursor) ExecuteMultiShard(ctx context.Context, primitive Primitive, rss []*srvtopo.ResolvedShard, queries []*querypb.BoundQuery, rollbackOnError, canAutocommit, fetchLastInsertID bool) (*sqltypes.Result, []error) {
panic("unimplemented")
}
@@ -376,11 +376,11 @@ func (t *noopVCursor) AutocommitApproval() bool {
panic("unimplemented")
}
-func (t *noopVCursor) ExecuteStandalone(ctx context.Context, primitive Primitive, query string, bindvars map[string]*querypb.BindVariable, rs *srvtopo.ResolvedShard) (*sqltypes.Result, error) {
+func (t *noopVCursor) ExecuteStandalone(ctx context.Context, primitive Primitive, query string, bindvars map[string]*querypb.BindVariable, rs *srvtopo.ResolvedShard, fetchLastInsertID bool) (*sqltypes.Result, error) {
panic("unimplemented")
}
-func (t *noopVCursor) StreamExecuteMulti(ctx context.Context, primitive Primitive, query string, rss []*srvtopo.ResolvedShard, bindVars []map[string]*querypb.BindVariable, rollbackOnError bool, autocommit bool, callback func(reply *sqltypes.Result) error) []error {
+func (t *noopVCursor) StreamExecuteMulti(ctx context.Context, primitive Primitive, query string, rss []*srvtopo.ResolvedShard, bindVars []map[string]*querypb.BindVariable, rollbackOnError, autocommit, fetchLastInsertID bool, callback func(reply *sqltypes.Result) error) []error {
panic("unimplemented")
}
@@ -587,7 +587,7 @@ func (f *loggingVCursor) Execute(ctx context.Context, method string, query strin
return f.nextResult()
}
-func (f *loggingVCursor) ExecuteMultiShard(ctx context.Context, primitive Primitive, rss []*srvtopo.ResolvedShard, queries []*querypb.BoundQuery, rollbackOnError, canAutocommit bool) (*sqltypes.Result, []error) {
+func (f *loggingVCursor) ExecuteMultiShard(ctx context.Context, primitive Primitive, rss []*srvtopo.ResolvedShard, queries []*querypb.BoundQuery, rollbackOnError, canAutocommit, fetchLastInsertID bool) (*sqltypes.Result, []error) {
f.mu.Lock()
defer f.mu.Unlock()
f.log = append(f.log, fmt.Sprintf("ExecuteMultiShard %v%v %v", printResolvedShardQueries(rss, queries), rollbackOnError, canAutocommit))
@@ -606,12 +606,12 @@ func (f *loggingVCursor) AutocommitApproval() bool {
return true
}
-func (f *loggingVCursor) ExecuteStandalone(ctx context.Context, primitive Primitive, query string, bindvars map[string]*querypb.BindVariable, rs *srvtopo.ResolvedShard) (*sqltypes.Result, error) {
+func (f *loggingVCursor) ExecuteStandalone(ctx context.Context, _ Primitive, query string, bindvars map[string]*querypb.BindVariable, rs *srvtopo.ResolvedShard, fetchLastInsertID bool) (*sqltypes.Result, error) {
f.log = append(f.log, fmt.Sprintf("ExecuteStandalone %s %v %s %s", query, printBindVars(bindvars), rs.Target.Keyspace, rs.Target.Shard))
return f.nextResult()
}
-func (f *loggingVCursor) StreamExecuteMulti(ctx context.Context, primitive Primitive, query string, rss []*srvtopo.ResolvedShard, bindVars []map[string]*querypb.BindVariable, rollbackOnError bool, autocommit bool, callback func(reply *sqltypes.Result) error) []error {
+func (f *loggingVCursor) StreamExecuteMulti(ctx context.Context, primitive Primitive, query string, rss []*srvtopo.ResolvedShard, bindVars []map[string]*querypb.BindVariable, rollbackOnError, autocommit, fetchLastInsertID bool, callback func(reply *sqltypes.Result) error) []error {
f.mu.Lock()
f.log = append(f.log, fmt.Sprintf("StreamExecuteMulti %s %s", query, printResolvedShardsBindVars(rss, bindVars)))
if f.onStreamExecuteMultiFn != nil {
diff --git a/go/vt/vtgate/engine/insert.go b/go/vt/vtgate/engine/insert.go
index cd462966ccc..10a4048572f 100644
--- a/go/vt/vtgate/engine/insert.go
+++ b/go/vt/vtgate/engine/insert.go
@@ -58,6 +58,8 @@ type Insert struct {
// Alias represents the row alias with columns if specified in the query.
Alias string
+
+ FetchLastInsertID bool
}
// newQueryInsert creates an Insert with a query string.
@@ -169,13 +171,14 @@ func (ins *Insert) executeInsertQueries(
if err != nil {
return nil, err
}
- result, errs := vcursor.ExecuteMultiShard(ctx, ins, rss, queries, true /* rollbackOnError */, autocommit)
+ result, errs := vcursor.ExecuteMultiShard(ctx, ins, rss, queries, true /*rollbackOnError*/, autocommit, ins.FetchLastInsertID)
if errs != nil {
return nil, vterrors.Aggregate(errs)
}
if insertID != 0 {
result.InsertID = insertID
+ result.InsertIDChanged = true
}
return result, nil
}
@@ -383,6 +386,10 @@ func (ins *Insert) description() PrimitiveDescription {
}
}
+ if ins.FetchLastInsertID {
+ other["FetchLastInsertID"] = true
+ }
+
return PrimitiveDescription{
OperatorType: "Insert",
Keyspace: ins.Keyspace,
diff --git a/go/vt/vtgate/engine/insert_common.go b/go/vt/vtgate/engine/insert_common.go
index e29aa7fd792..629d848d978 100644
--- a/go/vt/vtgate/engine/insert_common.go
+++ b/go/vt/vtgate/engine/insert_common.go
@@ -77,6 +77,8 @@ type (
// ColVindexes are the vindexes that will use the VindexValues
ColVindexes []*vindexes.ColumnVindex
+ FetchLastInsertID bool
+
// Prefix, Suffix are for sharded insert plans.
Prefix string
Suffix sqlparser.OnDup
@@ -159,7 +161,7 @@ func (ins *InsertCommon) executeUnshardedTableQuery(ctx context.Context, vcursor
if err != nil {
return nil, err
}
- qr, err := execShard(ctx, loggingPrimitive, vcursor, query, bindVars, rss[0], true, !ins.PreventAutoCommit /* canAutocommit */)
+ qr, err := execShard(ctx, loggingPrimitive, vcursor, query, bindVars, rss[0], true, !ins.PreventAutoCommit /* canAutocommit */, false)
if err != nil {
return nil, err
}
@@ -169,6 +171,7 @@ func (ins *InsertCommon) executeUnshardedTableQuery(ctx context.Context, vcursor
// values, we don't return an error because this behavior
// is required to support migration.
if insertID != 0 {
+ qr.InsertIDChanged = true
qr.InsertID = insertID
}
return qr, nil
@@ -451,7 +454,7 @@ func (ic *InsertCommon) execGenerate(ctx context.Context, vcursor VCursor, loggi
return 0, vterrors.Errorf(vtrpcpb.Code_INVALID_ARGUMENT, "auto sequence generation can happen through single shard only, it is getting routed to %d shards", len(rss))
}
bindVars := map[string]*querypb.BindVariable{nextValBV: sqltypes.Int64BindVariable(count)}
- qr, err := vcursor.ExecuteStandalone(ctx, loggingPrimitive, ic.Generate.Query, bindVars, rss[0])
+ qr, err := vcursor.ExecuteStandalone(ctx, loggingPrimitive, ic.Generate.Query, bindVars, rss[0], ic.FetchLastInsertID)
if err != nil {
return 0, err
}
diff --git a/go/vt/vtgate/engine/insert_select.go b/go/vt/vtgate/engine/insert_select.go
index f8f3936e323..bccee5f2cf9 100644
--- a/go/vt/vtgate/engine/insert_select.go
+++ b/go/vt/vtgate/engine/insert_select.go
@@ -207,7 +207,7 @@ func (ins *InsertSelect) executeInsertQueries(
if err != nil {
return nil, err
}
- result, errs := vcursor.ExecuteMultiShard(ctx, ins, rss, queries, true /* rollbackOnError */, autocommit)
+ result, errs := vcursor.ExecuteMultiShard(ctx, ins, rss, queries, true, autocommit, false)
if errs != nil {
return nil, vterrors.Aggregate(errs)
}
diff --git a/go/vt/vtgate/engine/limit.go b/go/vt/vtgate/engine/limit.go
index 01fcde6bd82..d50a0d4adde 100644
--- a/go/vt/vtgate/engine/limit.go
+++ b/go/vt/vtgate/engine/limit.go
@@ -33,11 +33,22 @@ import (
var _ Primitive = (*Limit)(nil)
-// Limit is a primitive that performs the LIMIT operation.
+// Limit performs the LIMIT operation, restricting the number of rows returned.
type Limit struct {
- Count evalengine.Expr
+ // Count specifies the maximum number of rows to return.
+ Count evalengine.Expr
+
+ // Offset specifies the number of rows to skip before returning results.
Offset evalengine.Expr
- Input Primitive
+
+ // RequireCompleteInput determines if all input rows must be fully retrieved.
+ // - If true, all Result structs are passed through, and the total rows are limited.
+ // - If false, Limit returns io.EOF once the limit is reached in streaming mode,
+ // signaling the tablet to stop sending data.
+ RequireCompleteInput bool
+
+ // Input provides the input rows.
+ Input Primitive
}
var UpperLimitStr = "__upper_limit"
@@ -88,6 +99,10 @@ func (l *Limit) TryExecute(ctx context.Context, vcursor VCursor, bindVars map[st
return result, nil
}
+func (l *Limit) mustRetrieveAll(vcursor VCursor) bool {
+ return l.RequireCompleteInput || vcursor.Session().InTransaction()
+}
+
// TryStreamExecute satisfies the Primitive interface.
func (l *Limit) TryStreamExecute(ctx context.Context, vcursor VCursor, bindVars map[string]*querypb.BindVariable, wantfields bool, callback func(*sqltypes.Result) error) error {
count, offset, err := l.getCountAndOffset(ctx, vcursor, bindVars)
@@ -97,57 +112,78 @@ func (l *Limit) TryStreamExecute(ctx context.Context, vcursor VCursor, bindVars
bindVars = copyBindVars(bindVars)
- // When offset is present, we hijack the limit value so we can calculate
- // the offset in memory from the result of the scatter query with count + offset.
+ // Adjust the upper limit so that the initial fetch includes both the offset and count.
+ // We do this because we want to skip the first `offset` rows locally rather than on the server side.
bindVars[UpperLimitStr] = sqltypes.Int64BindVariable(int64(count + offset))
var mu sync.Mutex
err = vcursor.StreamExecutePrimitive(ctx, l.Input, bindVars, wantfields, func(qr *sqltypes.Result) error {
mu.Lock()
defer mu.Unlock()
- if wantfields && len(qr.Fields) != 0 {
- if err := callback(&sqltypes.Result{Fields: qr.Fields}); err != nil {
- return err
- }
- }
- inputSize := len(qr.Rows)
- if inputSize == 0 {
- return nil
- }
- // we've still not seen all rows we need to see before we can return anything to the client
+ inputSize := len(qr.Rows)
+ // If we still need to skip `offset` rows before returning any to the client:
if offset > 0 {
if inputSize <= offset {
- // not enough to return anything yet
+ // not enough to return anything yet, but we still want to pass on metadata such as last_insert_id
offset -= inputSize
- return nil
+ if !wantfields && !l.mustRetrieveAll(vcursor) {
+ return nil
+ }
+ if len(qr.Fields) > 0 {
+ wantfields = false
+ }
+ qr.Rows = nil
+ return callback(qr)
}
+ // Skip `offset` rows from this batch and reset offset to 0.
qr.Rows = qr.Rows[offset:]
offset = 0
}
+ // At this point, we've dealt with the offset. Now handle the count (limit).
if count == 0 {
- return io.EOF
+ // If count is zero, we've fetched everything we need.
+ if !wantfields && !l.mustRetrieveAll(vcursor) {
+ return io.EOF
+ }
+ if len(qr.Fields) > 0 {
+ wantfields = false
+ }
+
+ // If we require the complete input, or we are in a transaction, we cannot return io.EOF early.
+ // Instead, we return empty results as needed until input ends.
+ qr.Rows = nil
+ return callback(qr)
+ }
+
+ if len(qr.Fields) > 0 {
+ wantfields = false
}
// reduce count till 0.
- result := &sqltypes.Result{Rows: qr.Rows}
- resultSize := len(result.Rows)
+ resultSize := len(qr.Rows)
if count > resultSize {
count -= resultSize
- return callback(result)
+ return callback(qr)
}
- result.Rows = result.Rows[:count]
+
+ qr.Rows = qr.Rows[:count]
count = 0
- if err := callback(result); err != nil {
+ if err := callback(qr); err != nil {
return err
}
+
+ // If we required complete input or are in a transaction, we must not exit early.
+ // We'll return empty batches until the input is done.
+ if l.mustRetrieveAll(vcursor) {
+ return nil
+ }
+
return io.EOF
})
if err == io.EOF {
- // We may get back the EOF we returned in the callback.
- // If so, suppress it.
return nil
}
if err != nil {
@@ -217,6 +253,9 @@ func (l *Limit) description() PrimitiveDescription {
if l.Offset != nil {
other["Offset"] = sqlparser.String(l.Offset)
}
+ if l.RequireCompleteInput {
+ other["RequireCompleteInput"] = true
+ }
return PrimitiveDescription{
OperatorType: "Limit",
diff --git a/go/vt/vtgate/engine/limit_test.go b/go/vt/vtgate/engine/limit_test.go
index 8b91dadecb5..8ab31610e62 100644
--- a/go/vt/vtgate/engine/limit_test.go
+++ b/go/vt/vtgate/engine/limit_test.go
@@ -353,9 +353,7 @@ func TestLimitOffsetExecute(t *testing.T) {
t.Errorf("l.Execute:\n got %v, want\n%v", result, wantResult)
}
}
-
func TestLimitStreamExecute(t *testing.T) {
- bindVars := make(map[string]*querypb.BindVariable)
fields := sqltypes.MakeTestFields(
"col1|col2",
"int64|varchar",
@@ -366,88 +364,88 @@ func TestLimitStreamExecute(t *testing.T) {
"b|2",
"c|3",
)
- fp := &fakePrimitive{
- results: []*sqltypes.Result{inputResult},
- }
-
- l := &Limit{
- Count: evalengine.NewLiteralInt(2),
- Input: fp,
- }
- // Test with limit smaller than input.
- var results []*sqltypes.Result
- err := l.TryStreamExecute(context.Background(), &noopVCursor{}, bindVars, true, func(qr *sqltypes.Result) error {
- results = append(results, qr)
- return nil
- })
- require.NoError(t, err)
- wantResults := sqltypes.MakeTestStreamingResults(
- fields,
- "a|1",
- "b|2",
- )
- require.Len(t, results, len(wantResults))
- for i, result := range results {
- if !result.Equal(wantResults[i]) {
- t.Errorf("l.StreamExecute:\n%s, want\n%s", sqltypes.PrintResults(results), sqltypes.PrintResults(wantResults))
- }
- }
+ tests := []struct {
+ name string
+ countExpr evalengine.Expr
+ bindVars map[string]*querypb.BindVariable
+ want []*sqltypes.Result
+ RequireCompleteInput bool
+ }{{
+ name: "limit smaller than input (literal)",
+ countExpr: evalengine.NewLiteralInt(2),
+ want: sqltypes.MakeTestStreamingResults(
+ fields,
+ "a|1",
+ "b|2",
+ ),
+ }, {
+ name: "limit smaller than input (literal) - require complete input",
+ countExpr: evalengine.NewLiteralInt(2),
+ RequireCompleteInput: true,
+ want: sqltypes.MakeTestStreamingResults(
+ fields,
+ "a|1",
+ "b|2",
+ "---", // this extra result is required by RequireCompleteInput
+ ),
+ }, {
+ name: "limit smaller than input (bind var)",
+ countExpr: evalengine.NewBindVar("l", evalengine.NewType(sqltypes.Int64, collations.CollationBinaryID)),
+ bindVars: map[string]*querypb.BindVariable{"l": sqltypes.Int64BindVariable(2)},
+ want: sqltypes.MakeTestStreamingResults(
+ fields,
+ "a|1",
+ "b|2",
+ ),
+ }, {
+ name: "limit equal to input",
+ countExpr: evalengine.NewLiteralInt(3),
+ want: sqltypes.MakeTestStreamingResults(
+ fields,
+ "a|1",
+ "b|2",
+ "---",
+ "c|3",
+ ),
+ }, {
+ name: "limit higher than input",
+ countExpr: evalengine.NewLiteralInt(4),
+ // same as limit=3
+ want: sqltypes.MakeTestStreamingResults(
+ fields,
+ "a|1",
+ "b|2",
+ "---",
+ "c|3",
+ ),
+ }}
- // Test with bind vars.
- fp.rewind()
- l.Count = evalengine.NewBindVar("l", evalengine.NewType(sqltypes.Int64, collations.CollationBinaryID))
- results = nil
- err = l.TryStreamExecute(context.Background(), &noopVCursor{}, map[string]*querypb.BindVariable{"l": sqltypes.Int64BindVariable(2)}, true, func(qr *sqltypes.Result) error {
- results = append(results, qr)
- return nil
- })
- require.NoError(t, err)
- require.Len(t, results, len(wantResults))
- for i, result := range results {
- if !result.Equal(wantResults[i]) {
- t.Errorf("l.StreamExecute:\n%s, want\n%s", sqltypes.PrintResults(results), sqltypes.PrintResults(wantResults))
- }
- }
+ for _, tt := range tests {
+ t.Run(tt.name, func(t *testing.T) {
+ fp := &fakePrimitive{
+ results: []*sqltypes.Result{inputResult},
+ }
- // Test with limit equal to input
- fp.rewind()
- l.Count = evalengine.NewLiteralInt(3)
- results = nil
- err = l.TryStreamExecute(context.Background(), &noopVCursor{}, bindVars, true, func(qr *sqltypes.Result) error {
- results = append(results, qr)
- return nil
- })
- require.NoError(t, err)
- wantResults = sqltypes.MakeTestStreamingResults(
- fields,
- "a|1",
- "b|2",
- "---",
- "c|3",
- )
- require.Len(t, results, len(wantResults))
- for i, result := range results {
- if !result.Equal(wantResults[i]) {
- t.Errorf("l.StreamExecute:\n%s, want\n%s", sqltypes.PrintResults(results), sqltypes.PrintResults(wantResults))
- }
- }
+ l := &Limit{
+ Count: tt.countExpr,
+ RequireCompleteInput: tt.RequireCompleteInput,
+ Input: fp,
+ }
- // Test with limit higher than input.
- fp.rewind()
- l.Count = evalengine.NewLiteralInt(4)
- results = nil
- err = l.TryStreamExecute(context.Background(), &noopVCursor{}, bindVars, true, func(qr *sqltypes.Result) error {
- results = append(results, qr)
- return nil
- })
- require.NoError(t, err)
- // wantResults is same as before.
- require.Len(t, results, len(wantResults))
- for i, result := range results {
- if !result.Equal(wantResults[i]) {
- t.Errorf("l.StreamExecute:\n%s, want\n%s", sqltypes.PrintResults(results), sqltypes.PrintResults(wantResults))
- }
+ var results []*sqltypes.Result
+ err := l.TryStreamExecute(context.Background(), &noopVCursor{}, tt.bindVars, true, func(qr *sqltypes.Result) error {
+ results = append(results, qr)
+ return nil
+ })
+ require.NoError(t, err)
+ require.Len(t, results, len(tt.want))
+ for i, result := range results {
+ if !result.Equal(tt.want[i]) {
+ t.Errorf("l.StreamExecute:\n%s, want\n%s", sqltypes.PrintResults(results), sqltypes.PrintResults(tt.want))
+ }
+ }
+ })
}
}
diff --git a/go/vt/vtgate/engine/lock.go b/go/vt/vtgate/engine/lock.go
index 7739cbcd0cc..a8ba9f46df3 100644
--- a/go/vt/vtgate/engine/lock.go
+++ b/go/vt/vtgate/engine/lock.go
@@ -173,7 +173,7 @@ func (l *Lock) GetFields(ctx context.Context, vcursor VCursor, bindVars map[stri
Sql: l.FieldQuery,
BindVariables: bindVars,
}}
- qr, errs := vcursor.ExecuteMultiShard(ctx, l, rss, boundQuery, false, true)
+ qr, errs := vcursor.ExecuteMultiShard(ctx, l, rss, boundQuery, false, true, false)
if len(errs) > 0 {
return nil, vterrors.Aggregate(errs)
}
diff --git a/go/vt/vtgate/engine/merge_sort.go b/go/vt/vtgate/engine/merge_sort.go
index fac57c37ccb..abf2a65f311 100644
--- a/go/vt/vtgate/engine/merge_sort.go
+++ b/go/vt/vtgate/engine/merge_sort.go
@@ -21,19 +21,17 @@ import (
"io"
"vitess.io/vitess/go/mysql/sqlerror"
- "vitess.io/vitess/go/vt/vtgate/evalengine"
-
"vitess.io/vitess/go/sqltypes"
-
querypb "vitess.io/vitess/go/vt/proto/query"
vtrpcpb "vitess.io/vitess/go/vt/proto/vtrpc"
"vitess.io/vitess/go/vt/vterrors"
+ "vitess.io/vitess/go/vt/vtgate/evalengine"
)
// StreamExecutor is a subset of Primitive that MergeSort
// requires its inputs to satisfy.
type StreamExecutor interface {
- StreamExecute(ctx context.Context, vcursor VCursor, bindVars map[string]*querypb.BindVariable, wantfields bool, callback func(*sqltypes.Result) error) error
+ StreamExecute(ctx context.Context, vcursor VCursor, bindVars map[string]*querypb.BindVariable, wantfields bool, fetchLastInsertID bool, callback func(*sqltypes.Result) error) error
}
var _ Primitive = (*MergeSort)(nil)
@@ -54,6 +52,7 @@ type MergeSort struct {
Primitives []StreamExecutor
OrderBy evalengine.Comparison
ScatterErrorsAsWarnings bool
+ FetchLastInsertID bool
}
// RouteType satisfies Primitive.
@@ -85,7 +84,7 @@ func (ms *MergeSort) TryStreamExecute(ctx context.Context, vcursor VCursor, bind
gotFields := wantfields
handles := make([]*streamHandle, len(ms.Primitives))
for i, input := range ms.Primitives {
- handles[i] = runOneStream(ctx, vcursor, input, bindVars, gotFields)
+ handles[i] = runOneStream(ctx, vcursor, input, bindVars, gotFields, ms.FetchLastInsertID)
if !ms.ScatterErrorsAsWarnings {
// we only need the fields from the first input, unless we allow ScatterErrorsAsWarnings.
// in that case, we need to ask all the inputs for fields - we don't know which will return anything
@@ -216,13 +215,20 @@ func (ms *MergeSort) description() PrimitiveDescription {
// routine that pulls the rows out of each streamHandle can abort the stream
// by calling canceling the context.
type streamHandle struct {
- fields chan []*querypb.Field
- row chan []sqltypes.Value
- err error
+ fields chan []*querypb.Field
+ fieldSeen bool
+ row chan []sqltypes.Value
+ err error
}
// runOnestream starts a streaming query on one shard, and returns a streamHandle for it.
-func runOneStream(ctx context.Context, vcursor VCursor, input StreamExecutor, bindVars map[string]*querypb.BindVariable, wantfields bool) *streamHandle {
+func runOneStream(
+ ctx context.Context,
+ vcursor VCursor,
+ input StreamExecutor,
+ bindVars map[string]*querypb.BindVariable,
+ wantfields, fetchLastInsertID bool,
+) *streamHandle {
handle := &streamHandle{
fields: make(chan []*querypb.Field, 1),
row: make(chan []sqltypes.Value, 10),
@@ -232,8 +238,9 @@ func runOneStream(ctx context.Context, vcursor VCursor, input StreamExecutor, bi
defer close(handle.fields)
defer close(handle.row)
- handle.err = input.StreamExecute(ctx, vcursor, bindVars, wantfields, func(qr *sqltypes.Result) error {
- if len(qr.Fields) != 0 {
+ handle.err = input.StreamExecute(ctx, vcursor, bindVars, wantfields, fetchLastInsertID, func(qr *sqltypes.Result) error {
+ if !handle.fieldSeen && len(qr.Fields) != 0 {
+ handle.fieldSeen = true
select {
case handle.fields <- qr.Fields:
case <-ctx.Done():
diff --git a/go/vt/vtgate/engine/merge_sort_test.go b/go/vt/vtgate/engine/merge_sort_test.go
index 6b383e12572..60890283f89 100644
--- a/go/vt/vtgate/engine/merge_sort_test.go
+++ b/go/vt/vtgate/engine/merge_sort_test.go
@@ -411,7 +411,7 @@ type shardResult struct {
sendErr error
}
-func (sr *shardResult) StreamExecute(ctx context.Context, vcursor VCursor, bindVars map[string]*querypb.BindVariable, wantfields bool, callback func(*sqltypes.Result) error) error {
+func (sr *shardResult) StreamExecute(_ context.Context, _ VCursor, _ map[string]*querypb.BindVariable, _ bool, _ bool, callback func(*sqltypes.Result) error) error {
for _, r := range sr.results {
if err := callback(r); err != nil {
return err
diff --git a/go/vt/vtgate/engine/plan_description.go b/go/vt/vtgate/engine/plan_description.go
index e8e763c1ee1..f19be96123e 100644
--- a/go/vt/vtgate/engine/plan_description.go
+++ b/go/vt/vtgate/engine/plan_description.go
@@ -152,7 +152,11 @@ func PrimitiveDescriptionFromMap(data map[string]any) (pd PrimitiveDescription,
}
}
if ttt, isPresent := data["TargetTabletType"]; isPresent {
- pd.TargetTabletType = topodatapb.TabletType(ttt.(int))
+ val, ok := topodatapb.TabletType_value[ttt.(string)]
+ if !ok {
+ panic(fmt.Sprintf("TargetTabletType is not a valid tablet type: %v", ttt))
+ }
+ pd.TargetTabletType = topodatapb.TabletType(val)
}
if other, isPresent := data["Other"]; isPresent {
pd.Other = other.(map[string]any)
diff --git a/go/vt/vtgate/engine/primitive.go b/go/vt/vtgate/engine/primitive.go
index 4f3a388d04f..e6fa102581e 100644
--- a/go/vt/vtgate/engine/primitive.go
+++ b/go/vt/vtgate/engine/primitive.go
@@ -70,9 +70,9 @@ type (
StreamExecutePrimitiveStandalone(ctx context.Context, primitive Primitive, bindVars map[string]*querypb.BindVariable, wantfields bool, callback func(result *sqltypes.Result) error) error
// Shard-level functions.
- ExecuteMultiShard(ctx context.Context, primitive Primitive, rss []*srvtopo.ResolvedShard, queries []*querypb.BoundQuery, rollbackOnError, canAutocommit bool) (*sqltypes.Result, []error)
- ExecuteStandalone(ctx context.Context, primitive Primitive, query string, bindVars map[string]*querypb.BindVariable, rs *srvtopo.ResolvedShard) (*sqltypes.Result, error)
- StreamExecuteMulti(ctx context.Context, primitive Primitive, query string, rss []*srvtopo.ResolvedShard, bindVars []map[string]*querypb.BindVariable, rollbackOnError bool, autocommit bool, callback func(reply *sqltypes.Result) error) []error
+ ExecuteMultiShard(ctx context.Context, primitive Primitive, rss []*srvtopo.ResolvedShard, queries []*querypb.BoundQuery, rollbackOnError, canAutocommit, fetchLastInsertID bool) (*sqltypes.Result, []error)
+ ExecuteStandalone(ctx context.Context, primitive Primitive, query string, bindVars map[string]*querypb.BindVariable, rs *srvtopo.ResolvedShard, fetchLastInsertID bool) (*sqltypes.Result, error)
+ StreamExecuteMulti(ctx context.Context, primitive Primitive, query string, rss []*srvtopo.ResolvedShard, bindVars []map[string]*querypb.BindVariable, rollbackOnError, autocommit, fetchLastInsertID bool, callback func(reply *sqltypes.Result) error) []error
// Keyspace ID level functions.
ExecuteKeyspaceID(ctx context.Context, keyspace string, ksid []byte, query string, bindVars map[string]*querypb.BindVariable, rollbackOnError, autocommit bool) (*sqltypes.Result, error)
diff --git a/go/vt/vtgate/engine/route.go b/go/vt/vtgate/engine/route.go
index 59682dd91fe..20ab7695f70 100644
--- a/go/vt/vtgate/engine/route.go
+++ b/go/vt/vtgate/engine/route.go
@@ -95,6 +95,8 @@ type Route struct {
// select count(*) from tbl where lookupColumn = 'not there'
// select exists()
NoRoutesSpecialHandling bool
+
+ FetchLastInsertID bool
}
// NewRoute creates a Route.
@@ -181,7 +183,7 @@ func (route *Route) executeShards(
}
queries := getQueries(route.Query, bvs)
- result, errs := vcursor.ExecuteMultiShard(ctx, route, rss, queries, false /* rollbackOnError */, false /* canAutocommit */)
+ result, errs := vcursor.ExecuteMultiShard(ctx, route, rss, queries, false /*rollbackOnError*/, false /*canAutocommit*/, route.FetchLastInsertID)
route.executeWarmingReplicaRead(ctx, vcursor, bindVars, queries)
@@ -278,7 +280,7 @@ func (route *Route) streamExecuteShards(
}
if len(route.OrderBy) == 0 {
- errs := vcursor.StreamExecuteMulti(ctx, route, route.Query, rss, bvs, false /* rollbackOnError */, false /* autocommit */, func(qr *sqltypes.Result) error {
+ errs := vcursor.StreamExecuteMulti(ctx, route, route.Query, rss, bvs, false /* rollbackOnError */, false /* autocommit */, route.FetchLastInsertID, func(qr *sqltypes.Result) error {
return callback(qr.Truncate(route.TruncateColumnCount))
})
if len(errs) > 0 {
@@ -316,10 +318,12 @@ func (route *Route) mergeSort(
primitive: route,
})
}
+
ms := MergeSort{
Primitives: prims,
OrderBy: route.OrderBy,
ScatterErrorsAsWarnings: route.ScatterErrorsAsWarnings,
+ FetchLastInsertID: route.FetchLastInsertID,
}
return vcursor.StreamExecutePrimitive(ctx, &ms, bindVars, wantfields, func(qr *sqltypes.Result) error {
return callback(qr.Truncate(route.TruncateColumnCount))
@@ -351,7 +355,7 @@ func (route *Route) GetFields(ctx context.Context, vcursor VCursor, bindVars map
}
rs = rss[0]
}
- qr, err := execShard(ctx, route, vcursor, route.FieldQuery, bindVars, rs, false /* rollbackOnError */, false /* canAutocommit */)
+ qr, err := execShard(ctx, route, vcursor, route.FieldQuery, bindVars, rs, false /* rollbackOnError */, false /* canAutocommit */, route.FetchLastInsertID)
if err != nil {
return nil, err
}
@@ -374,6 +378,9 @@ func (route *Route) description() PrimitiveDescription {
"Table": route.GetTableName(),
"FieldQuery": route.FieldQuery,
}
+ if route.FetchLastInsertID {
+ other["FetchLastInsertID"] = true
+ }
if route.Vindex != nil {
other["Vindex"] = route.Vindex.String()
}
@@ -479,7 +486,7 @@ func execShard(
query string,
bindVars map[string]*querypb.BindVariable,
rs *srvtopo.ResolvedShard,
- rollbackOnError, canAutocommit bool,
+ rollbackOnError, canAutocommit, fetchLastInsertID bool,
) (*sqltypes.Result, error) {
autocommit := canAutocommit && vcursor.AutocommitApproval()
result, errs := vcursor.ExecuteMultiShard(ctx, primitive, []*srvtopo.ResolvedShard{rs}, []*querypb.BoundQuery{
@@ -487,7 +494,7 @@ func execShard(
Sql: query,
BindVariables: bindVars,
},
- }, rollbackOnError, autocommit)
+ }, rollbackOnError, autocommit, fetchLastInsertID)
return result, vterrors.Aggregate(errs)
}
@@ -534,7 +541,7 @@ func (route *Route) executeWarmingReplicaRead(ctx context.Context, vcursor VCurs
return
}
- _, errs := replicaVCursor.ExecuteMultiShard(ctx, route, rss, queries, false /* rollbackOnError */, false /* autocommit */)
+ _, errs := replicaVCursor.ExecuteMultiShard(ctx, route, rss, queries, false /*rollbackOnError*/, false /*canAutocommit*/, route.FetchLastInsertID)
if len(errs) > 0 {
log.Warningf("Failed to execute warming replica read: %v", errs)
} else {
diff --git a/go/vt/vtgate/engine/routing.go b/go/vt/vtgate/engine/routing.go
index e05366c4aeb..067278c1a93 100644
--- a/go/vt/vtgate/engine/routing.go
+++ b/go/vt/vtgate/engine/routing.go
@@ -51,6 +51,9 @@ const (
// IN is for routing a statement to a multi shard.
// Requires: A Vindex, and a multi Values.
IN
+ // Between is for routing a statement to a multi shard
+ // Requires: A Vindex, and start and end Value.
+ Between
// MultiEqual is used for routing queries with IN with tuple clause
// Requires: A Vindex, and a multi Tuple Values.
MultiEqual
@@ -78,6 +81,7 @@ var opName = map[Opcode]string{
EqualUnique: "EqualUnique",
Equal: "Equal",
IN: "IN",
+ Between: "Between",
MultiEqual: "MultiEqual",
Scatter: "Scatter",
DBA: "DBA",
@@ -157,6 +161,14 @@ func (rp *RoutingParameters) findRoute(ctx context.Context, vcursor VCursor, bin
default:
return rp.in(ctx, vcursor, bindVars)
}
+ case Between:
+ switch rp.Vindex.(type) {
+ case vindexes.SingleColumn:
+ return rp.between(ctx, vcursor, bindVars)
+ default:
+ // Only SingleColumn vindex supported.
+ return nil, nil, vterrors.VT13001("between supported on SingleColumn vindex only")
+ }
case MultiEqual:
switch rp.Vindex.(type) {
case vindexes.MultiColumn:
@@ -396,6 +408,19 @@ func (rp *RoutingParameters) inMultiCol(ctx context.Context, vcursor VCursor, bi
return rss, shardVarsMultiCol(bindVars, mapVals, isSingleVal), nil
}
+func (rp *RoutingParameters) between(ctx context.Context, vcursor VCursor, bindVars map[string]*querypb.BindVariable) ([]*srvtopo.ResolvedShard, []map[string]*querypb.BindVariable, error) {
+ env := evalengine.NewExpressionEnv(ctx, bindVars, vcursor)
+ value, err := env.Evaluate(rp.Values[0])
+ if err != nil {
+ return nil, nil, err
+ }
+ rss, values, err := resolveShardsBetween(ctx, vcursor, rp.Vindex.(vindexes.Sequential), rp.Keyspace, value.TupleValues())
+ if err != nil {
+ return nil, nil, err
+ }
+ return rss, shardVars(bindVars, values), nil
+}
+
func (rp *RoutingParameters) multiEqual(ctx context.Context, vcursor VCursor, bindVars map[string]*querypb.BindVariable) ([]*srvtopo.ResolvedShard, []map[string]*querypb.BindVariable, error) {
env := evalengine.NewExpressionEnv(ctx, bindVars, vcursor)
value, err := env.Evaluate(rp.Values[0])
@@ -520,6 +545,24 @@ func buildMultiColumnVindexValues(shardsValues [][][]sqltypes.Value) [][][]*quer
return shardsIds
}
+func resolveShardsBetween(ctx context.Context, vcursor VCursor, vindex vindexes.Sequential, keyspace *vindexes.Keyspace, vindexKeys []sqltypes.Value) ([]*srvtopo.ResolvedShard, [][]*querypb.Value, error) {
+ // Convert vindexKeys to []*querypb.Value
+ ids := make([]*querypb.Value, len(vindexKeys))
+ for i, vik := range vindexKeys {
+ ids[i] = sqltypes.ValueToProto(vik)
+ }
+
+ // RangeMap using the Vindex
+ destinations, err := vindex.RangeMap(ctx, vcursor, vindexKeys[0], vindexKeys[1])
+ if err != nil {
+ return nil, nil, err
+
+ }
+
+ // And use the Resolver to map to ResolvedShards.
+ return vcursor.ResolveDestinations(ctx, keyspace.Name, ids, destinations)
+}
+
func shardVars(bv map[string]*querypb.BindVariable, mapVals [][]*querypb.Value) []map[string]*querypb.BindVariable {
shardVars := make([]map[string]*querypb.BindVariable, len(mapVals))
for i, vals := range mapVals {
diff --git a/go/vt/vtgate/engine/send.go b/go/vt/vtgate/engine/send.go
index 2ebec5c679e..4655f680675 100644
--- a/go/vt/vtgate/engine/send.go
+++ b/go/vt/vtgate/engine/send.go
@@ -116,7 +116,7 @@ func (s *Send) TryExecute(ctx context.Context, vcursor VCursor, bindVars map[str
}
rollbackOnError := s.IsDML // for non-dml queries, there's no need to do a rollback
- result, errs := vcursor.ExecuteMultiShard(ctx, s, rss, queries, rollbackOnError, s.canAutoCommit(vcursor, rss))
+ result, errs := vcursor.ExecuteMultiShard(ctx, s, rss, queries, rollbackOnError, s.canAutoCommit(vcursor, rss), false)
err = vterrors.Aggregate(errs)
if err != nil {
return nil, err
@@ -179,7 +179,7 @@ func (s *Send) TryStreamExecute(ctx context.Context, vcursor VCursor, bindVars m
}
multiBindVars[i] = bv
}
- errors := vcursor.StreamExecuteMulti(ctx, s, s.Query, rss, multiBindVars, s.IsDML, s.canAutoCommit(vcursor, rss), callback)
+ errors := vcursor.StreamExecuteMulti(ctx, s, s.Query, rss, multiBindVars, s.IsDML, s.canAutoCommit(vcursor, rss), false, callback)
return vterrors.Aggregate(errors)
}
diff --git a/go/vt/vtgate/engine/set.go b/go/vt/vtgate/engine/set.go
index 9d370b6ec36..95fb5c87a32 100644
--- a/go/vt/vtgate/engine/set.go
+++ b/go/vt/vtgate/engine/set.go
@@ -248,7 +248,7 @@ func (svci *SysVarCheckAndIgnore) Execute(ctx context.Context, vcursor VCursor,
return vterrors.Errorf(vtrpcpb.Code_INVALID_ARGUMENT, "Unexpected error, DestinationKeyspaceID mapping to multiple shards: %v", svci.TargetDestination)
}
checkSysVarQuery := fmt.Sprintf("select 1 from dual where @@%s = %s", svci.Name, svci.Expr)
- _, err = execShard(ctx, nil, vcursor, checkSysVarQuery, env.BindVars, rss[0], false /* rollbackOnError */, false /* canAutocommit */)
+ _, err = execShard(ctx, nil, vcursor, checkSysVarQuery, env.BindVars, rss[0], false /* rollbackOnError */, false /* canAutocommit */, false)
if err != nil {
// Rather than returning the error, we will just log the error
// as the intention for executing the query it to validate the current setting and eventually ignore it anyways.
@@ -308,7 +308,7 @@ func (svs *SysVarReservedConn) Execute(ctx context.Context, vcursor VCursor, env
BindVariables: env.BindVars,
}
}
- _, errs := vcursor.ExecuteMultiShard(ctx, nil, rss, queries, false /* rollbackOnError */, false /* canAutocommit */)
+ _, errs := vcursor.ExecuteMultiShard(ctx, nil /*primitive*/, rss, queries, false /*rollbackOnError*/, false /*canAutocommit*/, false /*fetchLastInsertID*/)
return vterrors.Aggregate(errs)
}
@@ -320,7 +320,7 @@ func (svs *SysVarReservedConn) execSetStatement(ctx context.Context, vcursor VCu
BindVariables: env.BindVars,
}
}
- _, errs := vcursor.ExecuteMultiShard(ctx, nil, rss, queries, false /* rollbackOnError */, false /* canAutocommit */)
+ _, errs := vcursor.ExecuteMultiShard(ctx, nil /*primitive*/, rss, queries, false /*rollbackOnError*/, false /*canAutocommit*/, false /*fetchLastInsertID*/)
return vterrors.Aggregate(errs)
}
@@ -333,7 +333,7 @@ func (svs *SysVarReservedConn) checkAndUpdateSysVar(ctx context.Context, vcursor
if err != nil {
return false, err
}
- qr, err := execShard(ctx, nil, vcursor, sysVarExprValidationQuery, res.BindVars, rss[0], false /* rollbackOnError */, false /* canAutocommit */)
+ qr, err := execShard(ctx, nil /*primitive*/, vcursor, sysVarExprValidationQuery, res.BindVars, rss[0], false /* rollbackOnError */, false /* canAutocommit */, false /*fetchLastInsertID*/)
if err != nil {
return false, err
}
diff --git a/go/vt/vtgate/engine/shard_route.go b/go/vt/vtgate/engine/shard_route.go
index 8365c6fdf59..1e901b9a8ea 100644
--- a/go/vt/vtgate/engine/shard_route.go
+++ b/go/vt/vtgate/engine/shard_route.go
@@ -37,8 +37,8 @@ type shardRoute struct {
}
// StreamExecute performs a streaming exec.
-func (sr *shardRoute) StreamExecute(ctx context.Context, vcursor VCursor, _ map[string]*querypb.BindVariable, _ bool, callback func(*sqltypes.Result) error) error {
+func (sr *shardRoute) StreamExecute(ctx context.Context, vcursor VCursor, _ map[string]*querypb.BindVariable, _ bool, fetchLastInsertID bool, callback func(*sqltypes.Result) error) error {
// TODO rollback on error and autocommit should probably not be used like this
- errors := vcursor.StreamExecuteMulti(ctx, sr.primitive, sr.query, []*srvtopo.ResolvedShard{sr.rs}, []map[string]*querypb.BindVariable{sr.bv}, false /* rollbackOnError */, false /* autocommit */, callback)
+ errors := vcursor.StreamExecuteMulti(ctx, sr.primitive, sr.query, []*srvtopo.ResolvedShard{sr.rs}, []map[string]*querypb.BindVariable{sr.bv}, false /* rollbackOnError */, false /* autocommit */, fetchLastInsertID, callback)
return vterrors.Aggregate(errors)
}
diff --git a/go/vt/vtgate/engine/unlock.go b/go/vt/vtgate/engine/unlock.go
index 5addbb957fa..1047abb6ec5 100644
--- a/go/vt/vtgate/engine/unlock.go
+++ b/go/vt/vtgate/engine/unlock.go
@@ -60,7 +60,7 @@ func (u *Unlock) TryExecute(ctx context.Context, vcursor VCursor, bindVars map[s
for i := 0; i < len(rss); i++ {
bqs[i] = &querypb.BoundQuery{Sql: unlockTables}
}
- qr, errs := vcursor.ExecuteMultiShard(ctx, u, rss, bqs, true, false)
+ qr, errs := vcursor.ExecuteMultiShard(ctx, u, rss, bqs, true, false, false)
return qr, vterrors.Aggregate(errs)
}
diff --git a/go/vt/vtgate/engine/update.go b/go/vt/vtgate/engine/update.go
index 27ca9ad12a1..49c8576fd84 100644
--- a/go/vt/vtgate/engine/update.go
+++ b/go/vt/vtgate/engine/update.go
@@ -102,7 +102,7 @@ func (upd *Update) updateVindexEntries(ctx context.Context, vcursor VCursor, bin
for i := range rss {
queries[i] = &querypb.BoundQuery{Sql: upd.OwnedVindexQuery, BindVariables: bindVars}
}
- subQueryResult, errors := vcursor.ExecuteMultiShard(ctx, upd, rss, queries, false /* rollbackOnError */, false /* canAutocommit */)
+ subQueryResult, errors := vcursor.ExecuteMultiShard(ctx, upd, rss, queries, false /*rollbackOnError*/, false /*canAutocommit*/, upd.FetchLastInsertID)
for _, err := range errors {
if err != nil {
return err
@@ -214,6 +214,9 @@ func (upd *Update) description() PrimitiveDescription {
if len(changedVindexes) > 0 {
other["ChangedVindexValues"] = changedVindexes
}
+ if upd.FetchLastInsertID {
+ other["FetchLastInsertID"] = upd.FetchLastInsertID
+ }
return PrimitiveDescription{
OperatorType: "Update",
diff --git a/go/vt/vtgate/engine/vexplain.go b/go/vt/vtgate/engine/vexplain.go
index 78941e8160f..0785f4d25ce 100644
--- a/go/vt/vtgate/engine/vexplain.go
+++ b/go/vt/vtgate/engine/vexplain.go
@@ -207,7 +207,7 @@ func (v *VExplain) convertToVExplainAllResult(ctx context.Context, vcursor VCurs
res, err := vcursor.ExecuteStandalone(ctx, nil, explainQuery, nil, &srvtopo.ResolvedShard{
Target: entry.Target,
Gateway: entry.Gateway,
- })
+ }, false)
if err != nil {
return nil, err
}
diff --git a/go/vt/vtgate/evalengine/compiler_test.go b/go/vt/vtgate/evalengine/compiler_test.go
index cb9b99e7776..88c13a479ed 100644
--- a/go/vt/vtgate/evalengine/compiler_test.go
+++ b/go/vt/vtgate/evalengine/compiler_test.go
@@ -740,6 +740,26 @@ func TestCompilerSingle(t *testing.T) {
expression: `cast(_utf32 0x0000FF as binary)`,
result: `VARBINARY("\x00\x00\x00\xff")`,
},
+ {
+ expression: `DATE_FORMAT(timestamp '2024-12-30 10:34:58', "%u")`,
+ result: `VARCHAR("53")`,
+ },
+ {
+ expression: `WEEK(timestamp '2024-12-30 10:34:58', 0)`,
+ result: `INT64(52)`,
+ },
+ {
+ expression: `WEEK(timestamp '2024-12-30 10:34:58', 1)`,
+ result: `INT64(53)`,
+ },
+ {
+ expression: `WEEK(timestamp '2024-01-01 10:34:58', 0)`,
+ result: `INT64(0)`,
+ },
+ {
+ expression: `WEEK(timestamp '2024-01-01 10:34:58', 1)`,
+ result: `INT64(1)`,
+ },
}
tz, _ := time.LoadLocation("Europe/Madrid")
diff --git a/go/vt/vtgate/evalengine/testcases/inputs.go b/go/vt/vtgate/evalengine/testcases/inputs.go
index ac23281fd54..4c65cc5002f 100644
--- a/go/vt/vtgate/evalengine/testcases/inputs.go
+++ b/go/vt/vtgate/evalengine/testcases/inputs.go
@@ -108,6 +108,7 @@ var inputConversions = []string{
"time '10:04:58'", "time '31:34:58'", "time '32:34:58'", "time '130:34:58'", "time '5 10:34:58'",
"time '10:04:58.1'", "time '31:34:58.4'", "time '32:34:58.5'", "time '130:34:58.6'", "time '5 10:34:58.9'", "date '2000-01-01'",
"timestamp '2000-01-01 10:34:58'", "timestamp '2000-01-01 10:34:58.123456'", "timestamp '2000-01-01 10:34:58.978654'",
+ "timestamp '2024-12-30 10:34:58'",
"20000101103458", "20000101103458.1234", "20000101103458.123456", "20000101", "103458", "103458.123456",
"'20000101103458'", "'20000101103458.1234'", "'20000101103458.123456'", "'20000101'", "'103458'", "'103458.123456'",
"'20000101103458foo'", "'20000101103458.1234foo'", "'20000101103458.123456foo'", "'20000101foo'", "'103458foo'", "'103458.123456foo'",
diff --git a/go/vt/vtgate/executor.go b/go/vt/vtgate/executor.go
index 0bb47361f55..d3d2ba8e8fd 100644
--- a/go/vt/vtgate/executor.go
+++ b/go/vt/vtgate/executor.go
@@ -234,9 +234,9 @@ func (e *Executor) Execute(ctx context.Context, mysqlCtx vtgateservice.MySQLConn
stmtType, result, err := e.execute(ctx, mysqlCtx, safeSession, sql, bindVars, logStats)
logStats.Error = err
if result == nil {
- saveSessionStats(safeSession, stmtType, 0, 0, 0, err)
+ saveSessionStats(safeSession, stmtType, 0, 0, err)
} else {
- saveSessionStats(safeSession, stmtType, result.RowsAffected, result.InsertID, len(result.Rows), err)
+ saveSessionStats(safeSession, stmtType, result.RowsAffected, len(result.Rows), err)
}
if result != nil && len(result.Rows) > warnMemoryRows {
warnings.Add("ResultsExceeded", 1)
@@ -266,7 +266,6 @@ type streaminResultReceiver struct {
stmtType sqlparser.StatementType
rowsAffected uint64
rowsReturned int
- insertID uint64
callback func(*sqltypes.Result) error
}
@@ -275,9 +274,6 @@ func (s *streaminResultReceiver) storeResultStats(typ sqlparser.StatementType, q
defer s.mu.Unlock()
s.rowsAffected += qr.RowsAffected
s.rowsReturned += len(qr.Rows)
- if qr.InsertID != 0 {
- s.insertID = qr.InsertID
- }
s.stmtType = typ
return s.callback(qr)
}
@@ -379,7 +375,7 @@ func (e *Executor) StreamExecute(
err = e.newExecute(ctx, mysqlCtx, safeSession, sql, bindVars, logStats, resultHandler, srr.storeResultStats)
logStats.Error = err
- saveSessionStats(safeSession, srr.stmtType, srr.rowsAffected, srr.insertID, srr.rowsReturned, err)
+ saveSessionStats(safeSession, srr.stmtType, srr.rowsAffected, srr.rowsReturned, err)
if srr.rowsReturned > warnMemoryRows {
warnings.Add("ResultsExceeded", 1)
piiSafeSQL, err := e.env.Parser().RedactSQLQuery(sql)
@@ -412,7 +408,7 @@ func canReturnRows(stmtType sqlparser.StatementType) bool {
}
}
-func saveSessionStats(safeSession *econtext.SafeSession, stmtType sqlparser.StatementType, rowsAffected, insertID uint64, rowsReturned int, err error) {
+func saveSessionStats(safeSession *econtext.SafeSession, stmtType sqlparser.StatementType, rowsAffected uint64, rowsReturned int, err error) {
safeSession.RowCount = -1
if err != nil {
return
@@ -420,9 +416,6 @@ func saveSessionStats(safeSession *econtext.SafeSession, stmtType sqlparser.Stat
if !safeSession.IsFoundRowsHandled() {
safeSession.FoundRows = uint64(rowsReturned)
}
- if insertID > 0 {
- safeSession.LastInsertId = insertID
- }
switch stmtType {
case sqlparser.StmtInsert, sqlparser.StmtReplace, sqlparser.StmtUpdate, sqlparser.StmtDelete:
safeSession.RowCount = int64(rowsAffected)
@@ -678,7 +671,7 @@ func (e *Executor) executeSPInAllSessions(ctx context.Context, safeSession *econ
})
queries = append(queries, &querypb.BoundQuery{Sql: sql})
}
- qr, errs = e.ExecuteMultiShard(ctx, nil, rss, queries, safeSession, false /*autocommit*/, ignoreMaxMemoryRows, nullResultsObserver{})
+ qr, errs = e.ExecuteMultiShard(ctx, nil, rss, queries, safeSession, false /*autocommit*/, ignoreMaxMemoryRows, nullResultsObserver{}, false)
err := vterrors.Aggregate(errs)
if err != nil {
return nil, err
@@ -1484,13 +1477,13 @@ func parseAndValidateQuery(query string, parser *sqlparser.Parser) (sqlparser.St
}
// ExecuteMultiShard implements the IExecutor interface
-func (e *Executor) ExecuteMultiShard(ctx context.Context, primitive engine.Primitive, rss []*srvtopo.ResolvedShard, queries []*querypb.BoundQuery, session *econtext.SafeSession, autocommit bool, ignoreMaxMemoryRows bool, resultsObserver econtext.ResultsObserver) (qr *sqltypes.Result, errs []error) {
- return e.scatterConn.ExecuteMultiShard(ctx, primitive, rss, queries, session, autocommit, ignoreMaxMemoryRows, resultsObserver)
+func (e *Executor) ExecuteMultiShard(ctx context.Context, primitive engine.Primitive, rss []*srvtopo.ResolvedShard, queries []*querypb.BoundQuery, session *econtext.SafeSession, autocommit bool, ignoreMaxMemoryRows bool, resultsObserver econtext.ResultsObserver, fetchLastInsertID bool) (qr *sqltypes.Result, errs []error) {
+ return e.scatterConn.ExecuteMultiShard(ctx, primitive, rss, queries, session, autocommit, ignoreMaxMemoryRows, resultsObserver, fetchLastInsertID)
}
// StreamExecuteMulti implements the IExecutor interface
-func (e *Executor) StreamExecuteMulti(ctx context.Context, primitive engine.Primitive, query string, rss []*srvtopo.ResolvedShard, vars []map[string]*querypb.BindVariable, session *econtext.SafeSession, autocommit bool, callback func(reply *sqltypes.Result) error, resultsObserver econtext.ResultsObserver) []error {
- return e.scatterConn.StreamExecuteMulti(ctx, primitive, query, rss, vars, session, autocommit, callback, resultsObserver)
+func (e *Executor) StreamExecuteMulti(ctx context.Context, primitive engine.Primitive, query string, rss []*srvtopo.ResolvedShard, vars []map[string]*querypb.BindVariable, session *econtext.SafeSession, autocommit bool, callback func(reply *sqltypes.Result) error, resultsObserver econtext.ResultsObserver, fetchLastInsertID bool) []error {
+ return e.scatterConn.StreamExecuteMulti(ctx, primitive, query, rss, vars, session, autocommit, callback, resultsObserver, fetchLastInsertID)
}
// ExecuteLock implements the IExecutor interface
diff --git a/go/vt/vtgate/executor_dml_test.go b/go/vt/vtgate/executor_dml_test.go
index 792e197f48d..503b5e5cd8b 100644
--- a/go/vt/vtgate/executor_dml_test.go
+++ b/go/vt/vtgate/executor_dml_test.go
@@ -1812,8 +1812,9 @@ func TestInsertGeneratorSharded(t *testing.T) {
Rows: [][]sqltypes.Value{{
sqltypes.NewInt64(1),
}},
- RowsAffected: 1,
- InsertID: 1,
+ RowsAffected: 1,
+ InsertIDChanged: true,
+ InsertID: 1,
}})
session := &vtgatepb.Session{
TargetString: "@primary",
@@ -1840,8 +1841,9 @@ func TestInsertGeneratorSharded(t *testing.T) {
}}
assertQueries(t, sbclookup, wantQueries)
wantResult := &sqltypes.Result{
- InsertID: 1,
- RowsAffected: 1,
+ InsertID: 1,
+ RowsAffected: 1,
+ InsertIDChanged: true,
}
utils.MustMatch(t, wantResult, result)
}
@@ -1854,8 +1856,9 @@ func TestInsertAutoincSharded(t *testing.T) {
Rows: [][]sqltypes.Value{{
sqltypes.NewInt64(1),
}},
- RowsAffected: 1,
- InsertID: 2,
+ RowsAffected: 1,
+ InsertID: 2,
+ InsertIDChanged: true,
}
sbc.SetResults([]*sqltypes.Result{wantResult})
session := &vtgatepb.Session{
@@ -1894,8 +1897,9 @@ func TestInsertGeneratorUnsharded(t *testing.T) {
}}
assertQueries(t, sbclookup, wantQueries)
wantResult := &sqltypes.Result{
- InsertID: 1,
- RowsAffected: 1,
+ InsertID: 1,
+ InsertIDChanged: true,
+ RowsAffected: 1,
}
utils.MustMatch(t, wantResult, result)
}
@@ -1912,8 +1916,9 @@ func TestInsertAutoincUnsharded(t *testing.T) {
Rows: [][]sqltypes.Value{{
sqltypes.NewInt64(1),
}},
- RowsAffected: 1,
- InsertID: 2,
+ RowsAffected: 1,
+ InsertID: 2,
+ InsertIDChanged: true,
}
sbclookup.SetResults([]*sqltypes.Result{wantResult})
@@ -1965,8 +1970,9 @@ func TestInsertLookupOwnedGenerator(t *testing.T) {
Rows: [][]sqltypes.Value{{
sqltypes.NewInt64(4),
}},
- RowsAffected: 1,
- InsertID: 1,
+ RowsAffected: 1,
+ InsertID: 1,
+ InsertIDChanged: true,
}})
session := &vtgatepb.Session{
TargetString: "@primary",
@@ -1993,8 +1999,9 @@ func TestInsertLookupOwnedGenerator(t *testing.T) {
}}
assertQueries(t, sbclookup, wantQueries)
wantResult := &sqltypes.Result{
- InsertID: 4,
- RowsAffected: 1,
+ InsertID: 4,
+ InsertIDChanged: true,
+ RowsAffected: 1,
}
utils.MustMatch(t, wantResult, result)
}
@@ -2226,8 +2233,9 @@ func TestMultiInsertGenerator(t *testing.T) {
Rows: [][]sqltypes.Value{{
sqltypes.NewInt64(1),
}},
- RowsAffected: 1,
- InsertID: 1,
+ RowsAffected: 1,
+ InsertIDChanged: true,
+ InsertID: 1,
}})
session := &vtgatepb.Session{
TargetString: "@primary",
@@ -2258,8 +2266,9 @@ func TestMultiInsertGenerator(t *testing.T) {
}}
assertQueries(t, sbclookup, wantQueries)
wantResult := &sqltypes.Result{
- InsertID: 1,
- RowsAffected: 1,
+ InsertIDChanged: true,
+ InsertID: 1,
+ RowsAffected: 1,
}
utils.MustMatch(t, wantResult, result)
}
@@ -2271,8 +2280,9 @@ func TestMultiInsertGeneratorSparse(t *testing.T) {
Rows: [][]sqltypes.Value{{
sqltypes.NewInt64(1),
}},
- RowsAffected: 1,
- InsertID: 1,
+ RowsAffected: 1,
+ InsertIDChanged: true,
+ InsertID: 1,
}})
session := &vtgatepb.Session{
TargetString: "@primary",
@@ -2307,8 +2317,9 @@ func TestMultiInsertGeneratorSparse(t *testing.T) {
}}
assertQueries(t, sbclookup, wantQueries)
wantResult := &sqltypes.Result{
- InsertID: 1,
- RowsAffected: 1,
+ InsertIDChanged: true,
+ InsertID: 1,
+ RowsAffected: 1,
}
utils.MustMatch(t, wantResult, result)
}
diff --git a/go/vt/vtgate/executor_select_test.go b/go/vt/vtgate/executor_select_test.go
index 86aafaefba4..411f19bb30d 100644
--- a/go/vt/vtgate/executor_select_test.go
+++ b/go/vt/vtgate/executor_select_test.go
@@ -3302,6 +3302,49 @@ func TestSelectFromInformationSchema(t *testing.T) {
sbc1.StringQueries())
}
+func TestStreamOrderByWithMultipleResults(t *testing.T) {
+ ctx := utils.LeakCheckContext(t)
+
+ // Special setup: Don't use createExecutorEnv.
+ cell := "aa"
+ hc := discovery.NewFakeHealthCheck(nil)
+ u := createSandbox(KsTestUnsharded)
+ s := createSandbox(KsTestSharded)
+ s.VSchema = executorVSchema
+ u.VSchema = unshardedVSchema
+ serv := newSandboxForCells(ctx, []string{cell})
+ resolver := newTestResolver(ctx, hc, serv, cell)
+ shards := []string{"-20", "20-40", "40-60", "60-80", "80-a0", "a0-c0", "c0-e0", "e0-"}
+ count := 1
+ for _, shard := range shards {
+ sbc := hc.AddTestTablet(cell, shard, 1, "TestExecutor", shard, topodatapb.TabletType_PRIMARY, true, 1, nil)
+ sbc.SetResults([]*sqltypes.Result{
+ sqltypes.MakeTestResult(sqltypes.MakeTestFields("id|col|weight_string(id)", "int32|int32|varchar"), fmt.Sprintf("%d|%d|NULL", count, count)),
+ sqltypes.MakeTestResult(sqltypes.MakeTestFields("id|col|weight_string(id)", "int32|int32|varchar"), fmt.Sprintf("%d|%d|NULL", count+10, count)),
+ })
+ count++
+ }
+ queryLogger := streamlog.New[*logstats.LogStats]("VTGate", queryLogBufferSize)
+ plans := DefaultPlanCache()
+ executor := NewExecutor(ctx, vtenv.NewTestEnv(), serv, cell, resolver, true, false, testBufferSize, plans, nil, false, querypb.ExecuteOptions_Gen4, 0)
+ executor.SetQueryLogger(queryLogger)
+ defer executor.Close()
+ // some sleep for all goroutines to start
+ time.Sleep(100 * time.Millisecond)
+ before := runtime.NumGoroutine()
+
+ query := "select id, col from user order by id"
+ gotResult, err := executorStream(ctx, executor, query)
+ require.NoError(t, err)
+
+ wantResult := sqltypes.MakeTestResult(sqltypes.MakeTestFields("id|col", "int32|int32"),
+ "1|1", "2|2", "3|3", "4|4", "5|5", "6|6", "7|7", "8|8", "11|1", "12|2", "13|3", "14|4", "15|5", "16|6", "17|7", "18|8")
+ assert.Equal(t, fmt.Sprintf("%v", wantResult.Rows), fmt.Sprintf("%v", gotResult.Rows))
+ // some sleep to close all goroutines.
+ time.Sleep(100 * time.Millisecond)
+ assert.GreaterOrEqual(t, before, runtime.NumGoroutine(), "left open goroutines lingering")
+}
+
func TestStreamOrderByLimitWithMultipleResults(t *testing.T) {
ctx := utils.LeakCheckContext(t)
diff --git a/go/vt/vtgate/executorcontext/vcursor_impl.go b/go/vt/vtgate/executorcontext/vcursor_impl.go
index c1f341b38cf..40317f5103a 100644
--- a/go/vt/vtgate/executorcontext/vcursor_impl.go
+++ b/go/vt/vtgate/executorcontext/vcursor_impl.go
@@ -95,8 +95,8 @@ type (
// vcursor_impl needs these facilities to be able to be able to execute queries for vindexes
iExecute interface {
Execute(ctx context.Context, mysqlCtx vtgateservice.MySQLConnection, method string, session *SafeSession, s string, vars map[string]*querypb.BindVariable) (*sqltypes.Result, error)
- ExecuteMultiShard(ctx context.Context, primitive engine.Primitive, rss []*srvtopo.ResolvedShard, queries []*querypb.BoundQuery, session *SafeSession, autocommit bool, ignoreMaxMemoryRows bool, resultsObserver ResultsObserver) (qr *sqltypes.Result, errs []error)
- StreamExecuteMulti(ctx context.Context, primitive engine.Primitive, query string, rss []*srvtopo.ResolvedShard, vars []map[string]*querypb.BindVariable, session *SafeSession, autocommit bool, callback func(reply *sqltypes.Result) error, observer ResultsObserver) []error
+ ExecuteMultiShard(ctx context.Context, primitive engine.Primitive, rss []*srvtopo.ResolvedShard, queries []*querypb.BoundQuery, session *SafeSession, autocommit bool, ignoreMaxMemoryRows bool, resultsObserver ResultsObserver, fetchLastInsertID bool) (qr *sqltypes.Result, errs []error)
+ StreamExecuteMulti(ctx context.Context, primitive engine.Primitive, query string, rss []*srvtopo.ResolvedShard, vars []map[string]*querypb.BindVariable, session *SafeSession, autocommit bool, callback func(reply *sqltypes.Result) error, observer ResultsObserver, fetchLastInsertID bool) []error
ExecuteLock(ctx context.Context, rs *srvtopo.ResolvedShard, query *querypb.BoundQuery, session *SafeSession, lockFuncType sqlparser.LockingFuncType) (*sqltypes.Result, error)
Commit(ctx context.Context, safeSession *SafeSession) error
ExecuteMessageStream(ctx context.Context, rss []*srvtopo.ResolvedShard, name string, callback func(*sqltypes.Result) error) error
@@ -675,12 +675,20 @@ func (vc *VCursorImpl) ExecutePrimitiveStandalone(ctx context.Context, primitive
func (vc *VCursorImpl) wrapCallback(callback func(*sqltypes.Result) error, primitive engine.Primitive) func(*sqltypes.Result) error {
if vc.interOpStats == nil {
- return callback
+ return func(r *sqltypes.Result) error {
+ if r.InsertIDUpdated() {
+ vc.SafeSession.LastInsertId = r.InsertID
+ }
+ return callback(r)
+ }
}
- return func(result *sqltypes.Result) error {
- vc.logOpTraffic(primitive, result)
- return callback(result)
+ return func(r *sqltypes.Result) error {
+ if r.InsertIDUpdated() {
+ vc.SafeSession.LastInsertId = r.InsertID
+ }
+ vc.logOpTraffic(primitive, r)
+ return callback(r)
}
}
@@ -753,7 +761,7 @@ func (vc *VCursorImpl) markSavepoint(ctx context.Context, needsRollbackOnParialE
}
// ExecuteMultiShard is part of the engine.VCursor interface.
-func (vc *VCursorImpl) ExecuteMultiShard(ctx context.Context, primitive engine.Primitive, rss []*srvtopo.ResolvedShard, queries []*querypb.BoundQuery, rollbackOnError, canAutocommit bool) (*sqltypes.Result, []error) {
+func (vc *VCursorImpl) ExecuteMultiShard(ctx context.Context, primitive engine.Primitive, rss []*srvtopo.ResolvedShard, queries []*querypb.BoundQuery, rollbackOnError, canAutocommit, fetchLastInsertID bool) (*sqltypes.Result, []error) {
noOfShards := len(rss)
atomic.AddUint64(&vc.logStats.ShardQueries, uint64(noOfShards))
err := vc.markSavepoint(ctx, rollbackOnError && (noOfShards > 1), map[string]*querypb.BindVariable{})
@@ -761,14 +769,17 @@ func (vc *VCursorImpl) ExecuteMultiShard(ctx context.Context, primitive engine.P
return nil, []error{err}
}
- qr, errs := vc.executor.ExecuteMultiShard(ctx, primitive, rss, commentedShardQueries(queries, vc.marginComments), vc.SafeSession, canAutocommit, vc.ignoreMaxMemoryRows, vc.observer)
+ qr, errs := vc.executor.ExecuteMultiShard(ctx, primitive, rss, commentedShardQueries(queries, vc.marginComments), vc.SafeSession, canAutocommit, vc.ignoreMaxMemoryRows, vc.observer, fetchLastInsertID)
vc.setRollbackOnPartialExecIfRequired(len(errs) != len(rss), rollbackOnError)
vc.logShardsQueried(primitive, len(rss))
+ if qr != nil && qr.InsertIDUpdated() {
+ vc.SafeSession.LastInsertId = qr.InsertID
+ }
return qr, errs
}
// StreamExecuteMulti is the streaming version of ExecuteMultiShard.
-func (vc *VCursorImpl) StreamExecuteMulti(ctx context.Context, primitive engine.Primitive, query string, rss []*srvtopo.ResolvedShard, bindVars []map[string]*querypb.BindVariable, rollbackOnError bool, autocommit bool, callback func(reply *sqltypes.Result) error) []error {
+func (vc *VCursorImpl) StreamExecuteMulti(ctx context.Context, primitive engine.Primitive, query string, rss []*srvtopo.ResolvedShard, bindVars []map[string]*querypb.BindVariable, rollbackOnError, autocommit, fetchLastInsertID bool, callback func(reply *sqltypes.Result) error) []error {
callback = vc.wrapCallback(callback, primitive)
noOfShards := len(rss)
@@ -778,7 +789,7 @@ func (vc *VCursorImpl) StreamExecuteMulti(ctx context.Context, primitive engine.
return []error{err}
}
- errs := vc.executor.StreamExecuteMulti(ctx, primitive, vc.marginComments.Leading+query+vc.marginComments.Trailing, rss, bindVars, vc.SafeSession, autocommit, callback, vc.observer)
+ errs := vc.executor.StreamExecuteMulti(ctx, primitive, vc.marginComments.Leading+query+vc.marginComments.Trailing, rss, bindVars, vc.SafeSession, autocommit, callback, vc.observer, fetchLastInsertID)
vc.setRollbackOnPartialExecIfRequired(len(errs) != len(rss), rollbackOnError)
return errs
@@ -791,7 +802,7 @@ func (vc *VCursorImpl) ExecuteLock(ctx context.Context, rs *srvtopo.ResolvedShar
}
// ExecuteStandalone is part of the engine.VCursor interface.
-func (vc *VCursorImpl) ExecuteStandalone(ctx context.Context, primitive engine.Primitive, query string, bindVars map[string]*querypb.BindVariable, rs *srvtopo.ResolvedShard) (*sqltypes.Result, error) {
+func (vc *VCursorImpl) ExecuteStandalone(ctx context.Context, primitive engine.Primitive, query string, bindVars map[string]*querypb.BindVariable, rs *srvtopo.ResolvedShard, fetchLastInsertID bool) (*sqltypes.Result, error) {
rss := []*srvtopo.ResolvedShard{rs}
bqs := []*querypb.BoundQuery{
{
@@ -801,8 +812,11 @@ func (vc *VCursorImpl) ExecuteStandalone(ctx context.Context, primitive engine.P
}
// The autocommit flag is always set to false because we currently don't
// execute DMLs through ExecuteStandalone.
- qr, errs := vc.executor.ExecuteMultiShard(ctx, primitive, rss, bqs, NewAutocommitSession(vc.SafeSession.Session), false /* autocommit */, vc.ignoreMaxMemoryRows, vc.observer)
+ qr, errs := vc.executor.ExecuteMultiShard(ctx, primitive, rss, bqs, NewAutocommitSession(vc.SafeSession.Session), false /* autocommit */, vc.ignoreMaxMemoryRows, vc.observer, fetchLastInsertID)
vc.logShardsQueried(primitive, len(rss))
+ if qr.InsertIDUpdated() {
+ vc.SafeSession.LastInsertId = qr.InsertID
+ }
return qr, vterrors.Aggregate(errs)
}
@@ -829,7 +843,7 @@ func (vc *VCursorImpl) ExecuteKeyspaceID(ctx context.Context, keyspace string, k
vc.SafeSession.SetQueryFromVindex(false)
}()
}
- qr, errs := vc.ExecuteMultiShard(ctx, nil, rss, queries, rollbackOnError, autocommit)
+ qr, errs := vc.ExecuteMultiShard(ctx, nil, rss, queries, rollbackOnError, autocommit, false)
return qr, vterrors.Aggregate(errs)
}
diff --git a/go/vt/vtgate/executorcontext/vcursor_impl_test.go b/go/vt/vtgate/executorcontext/vcursor_impl_test.go
index 16d2c03bf1c..08e27be4c51 100644
--- a/go/vt/vtgate/executorcontext/vcursor_impl_test.go
+++ b/go/vt/vtgate/executorcontext/vcursor_impl_test.go
@@ -389,12 +389,12 @@ func (f fakeExecutor) Execute(ctx context.Context, mysqlCtx vtgateservice.MySQLC
panic("implement me")
}
-func (f fakeExecutor) ExecuteMultiShard(ctx context.Context, primitive engine.Primitive, rss []*srvtopo.ResolvedShard, queries []*querypb.BoundQuery, session *SafeSession, autocommit bool, ignoreMaxMemoryRows bool, resultsObserver ResultsObserver) (qr *sqltypes.Result, errs []error) {
+func (f fakeExecutor) ExecuteMultiShard(ctx context.Context, primitive engine.Primitive, rss []*srvtopo.ResolvedShard, queries []*querypb.BoundQuery, session *SafeSession, autocommit bool, ignoreMaxMemoryRows bool, resultsObserver ResultsObserver, fetchLastInsertID bool) (qr *sqltypes.Result, errs []error) {
// TODO implement me
panic("implement me")
}
-func (f fakeExecutor) StreamExecuteMulti(ctx context.Context, primitive engine.Primitive, query string, rss []*srvtopo.ResolvedShard, vars []map[string]*querypb.BindVariable, session *SafeSession, autocommit bool, callback func(reply *sqltypes.Result) error, observer ResultsObserver) []error {
+func (f fakeExecutor) StreamExecuteMulti(ctx context.Context, primitive engine.Primitive, query string, rss []*srvtopo.ResolvedShard, vars []map[string]*querypb.BindVariable, session *SafeSession, autocommit bool, callback func(reply *sqltypes.Result) error, observer ResultsObserver, fetchLastInsertID bool) []error {
// TODO implement me
panic("implement me")
}
diff --git a/go/vt/vtgate/grpcvtgateconn/suite_test.go b/go/vt/vtgate/grpcvtgateconn/suite_test.go
index 0e544b05e66..32df3a2ab34 100644
--- a/go/vt/vtgate/grpcvtgateconn/suite_test.go
+++ b/go/vt/vtgate/grpcvtgateconn/suite_test.go
@@ -426,6 +426,7 @@ func testStreamExecute(t *testing.T, session *vtgateconn.VTGateSession) {
wantResult := *execCase.result
wantResult.RowsAffected = 0
wantResult.InsertID = 0
+ wantResult.InsertIDChanged = false
if !qr.Equal(&wantResult) {
t.Errorf("Unexpected result from StreamExecute: got %+v want %+v", qr, wantResult)
}
@@ -563,8 +564,9 @@ var result1 = sqltypes.Result{
Type: sqltypes.Int32,
},
},
- RowsAffected: 123,
- InsertID: 72,
+ RowsAffected: 123,
+ InsertID: 72,
+ InsertIDChanged: true,
Rows: [][]sqltypes.Value{
{
sqltypes.TestValue(sqltypes.Int16, "1"),
diff --git a/go/vt/vtgate/legacy_scatter_conn_test.go b/go/vt/vtgate/legacy_scatter_conn_test.go
index 0d49e7b7bd9..e31c5ae8161 100644
--- a/go/vt/vtgate/legacy_scatter_conn_test.go
+++ b/go/vt/vtgate/legacy_scatter_conn_test.go
@@ -101,7 +101,7 @@ func TestLegacyExecuteFailOnAutocommit(t *testing.T) {
},
Autocommit: false,
}
- _, errs := sc.ExecuteMultiShard(ctx, nil, rss, queries, econtext.NewSafeSession(session), true /*autocommit*/, false, nullResultsObserver{})
+ _, errs := sc.ExecuteMultiShard(ctx, nil, rss, queries, econtext.NewSafeSession(session), true /*autocommit*/, false, nullResultsObserver{}, false)
err := vterrors.Aggregate(errs)
require.Error(t, err)
require.Contains(t, err.Error(), "in autocommit mode, transactionID should be zero but was: 123")
@@ -125,7 +125,7 @@ func TestScatterConnExecuteMulti(t *testing.T) {
}
}
- qr, errs := sc.ExecuteMultiShard(ctx, nil, rss, queries, econtext.NewSafeSession(nil), false /*autocommit*/, false, nullResultsObserver{})
+ qr, errs := sc.ExecuteMultiShard(ctx, nil, rss, queries, econtext.NewSafeSession(nil), false /*autocommit*/, false, nullResultsObserver{}, false)
return qr, vterrors.Aggregate(errs)
})
}
@@ -145,7 +145,7 @@ func TestScatterConnStreamExecuteMulti(t *testing.T) {
defer mu.Unlock()
qr.AppendResult(r)
return nil
- }, nullResultsObserver{})
+ }, nullResultsObserver{}, false)
return qr, vterrors.Aggregate(errors)
})
}
@@ -312,7 +312,7 @@ func TestMaxMemoryRows(t *testing.T) {
sbc0.SetResults([]*sqltypes.Result{tworows, tworows})
sbc1.SetResults([]*sqltypes.Result{tworows, tworows})
- _, errs := sc.ExecuteMultiShard(ctx, nil, rss, queries, session, false, test.ignoreMaxMemoryRows, nullResultsObserver{})
+ _, errs := sc.ExecuteMultiShard(ctx, nil, rss, queries, session, false, test.ignoreMaxMemoryRows, nullResultsObserver{}, false)
if test.ignoreMaxMemoryRows {
require.NoError(t, err)
} else {
@@ -344,7 +344,7 @@ func TestLegaceHealthCheckFailsOnReservedConnections(t *testing.T) {
})
}
- _, errs := sc.ExecuteMultiShard(ctx, nil, rss, queries, session, false, false, nullResultsObserver{})
+ _, errs := sc.ExecuteMultiShard(ctx, nil, rss, queries, session, false, false, nullResultsObserver{}, false)
require.Error(t, vterrors.Aggregate(errs))
}
@@ -367,7 +367,7 @@ func executeOnShardsReturnsErr(t *testing.T, ctx context.Context, res *srvtopo.R
})
}
- _, errs := sc.ExecuteMultiShard(ctx, nil, rss, queries, session, false, false, nullResultsObserver{})
+ _, errs := sc.ExecuteMultiShard(ctx, nil, rss, queries, session, false, false, nullResultsObserver{}, false)
return vterrors.Aggregate(errs)
}
@@ -432,7 +432,7 @@ func TestMultiExecs(t *testing.T) {
observer := recordingResultsObserver{}
session := econtext.NewSafeSession(&vtgatepb.Session{})
- _, err := sc.ExecuteMultiShard(ctx, nil, rss, queries, session, false, false, &observer)
+ _, err := sc.ExecuteMultiShard(ctx, nil, rss, queries, session, false, false, &observer, false)
require.NoError(t, vterrors.Aggregate(err))
if len(sbc0.Queries) == 0 || len(sbc1.Queries) == 0 {
t.Fatalf("didn't get expected query")
@@ -484,7 +484,7 @@ func TestMultiExecs(t *testing.T) {
observer = recordingResultsObserver{}
_ = sc.StreamExecuteMulti(ctx, nil, "query", rss, bvs, session, false /* autocommit */, func(*sqltypes.Result) error {
return nil
- }, &observer)
+ }, &observer, false)
if !reflect.DeepEqual(sbc0.Queries[0].BindVariables, wantVars0) {
t.Errorf("got %+v, want %+v", sbc0.Queries[0].BindVariables, wantVars0)
}
@@ -515,27 +515,27 @@ func TestScatterConnSingleDB(t *testing.T) {
// TransactionMode_SINGLE in session
session := econtext.NewSafeSession(&vtgatepb.Session{InTransaction: true, TransactionMode: vtgatepb.TransactionMode_SINGLE})
queries := []*querypb.BoundQuery{{Sql: "query1"}}
- _, errors := sc.ExecuteMultiShard(ctx, nil, rss0, queries, session, false, false, nullResultsObserver{})
+ _, errors := sc.ExecuteMultiShard(ctx, nil, rss0, queries, session, false, false, nullResultsObserver{}, false)
require.Empty(t, errors)
- _, errors = sc.ExecuteMultiShard(ctx, nil, rss1, queries, session, false, false, nullResultsObserver{})
+ _, errors = sc.ExecuteMultiShard(ctx, nil, rss1, queries, session, false, false, nullResultsObserver{}, false)
require.Error(t, errors[0])
assert.Contains(t, errors[0].Error(), want)
// TransactionMode_SINGLE in txconn
sc.txConn.mode = vtgatepb.TransactionMode_SINGLE
session = econtext.NewSafeSession(&vtgatepb.Session{InTransaction: true})
- _, errors = sc.ExecuteMultiShard(ctx, nil, rss0, queries, session, false, false, nullResultsObserver{})
+ _, errors = sc.ExecuteMultiShard(ctx, nil, rss0, queries, session, false, false, nullResultsObserver{}, false)
require.Empty(t, errors)
- _, errors = sc.ExecuteMultiShard(ctx, nil, rss1, queries, session, false, false, nullResultsObserver{})
+ _, errors = sc.ExecuteMultiShard(ctx, nil, rss1, queries, session, false, false, nullResultsObserver{}, false)
require.Error(t, errors[0])
assert.Contains(t, errors[0].Error(), want)
// TransactionMode_MULTI in txconn. Should not fail.
sc.txConn.mode = vtgatepb.TransactionMode_MULTI
session = econtext.NewSafeSession(&vtgatepb.Session{InTransaction: true})
- _, errors = sc.ExecuteMultiShard(ctx, nil, rss0, queries, session, false, false, nullResultsObserver{})
+ _, errors = sc.ExecuteMultiShard(ctx, nil, rss0, queries, session, false, false, nullResultsObserver{}, false)
require.Empty(t, errors)
- _, errors = sc.ExecuteMultiShard(ctx, nil, rss1, queries, session, false, false, nullResultsObserver{})
+ _, errors = sc.ExecuteMultiShard(ctx, nil, rss1, queries, session, false, false, nullResultsObserver{}, false)
require.Empty(t, errors)
}
diff --git a/go/vt/vtgate/planbuilder/operator_transformers.go b/go/vt/vtgate/planbuilder/operator_transformers.go
index df14745e6b2..bc71c7195b4 100644
--- a/go/vt/vtgate/planbuilder/operator_transformers.go
+++ b/go/vt/vtgate/planbuilder/operator_transformers.go
@@ -22,12 +22,10 @@ import (
"strconv"
"strings"
- "vitess.io/vitess/go/mysql/collations"
"vitess.io/vitess/go/slice"
"vitess.io/vitess/go/sqltypes"
"vitess.io/vitess/go/vt/sqlparser"
"vitess.io/vitess/go/vt/sysvars"
- "vitess.io/vitess/go/vt/vtenv"
"vitess.io/vitess/go/vt/vterrors"
"vitess.io/vitess/go/vt/vtgate/engine"
"vitess.io/vitess/go/vt/vtgate/engine/opcode"
@@ -536,6 +534,7 @@ func routeToEngineRoute(ctx *plancontext.PlanningContext, op *operators.Route, h
TableName: strings.Join(tableNames, ", "),
RoutingParameters: rp,
TruncateColumnCount: op.ResultColumns,
+ FetchLastInsertID: ctx.SemTable.ShouldFetchLastInsertID(),
}
if hints != nil {
e.ScatterErrorsAsWarnings = hints.scatterErrorsAsWarnings
@@ -601,7 +600,7 @@ func transformRoutePlan(ctx *plancontext.PlanningContext, op *operators.Route) (
case *sqlparser.Delete:
return buildDeletePrimitive(ctx, op, dmlOp, stmt, hints)
case *sqlparser.Insert:
- return buildInsertPrimitive(op, dmlOp, stmt, hints)
+ return buildInsertPrimitive(ctx, op, dmlOp, stmt, hints)
default:
return nil, vterrors.VT13001(fmt.Sprintf("dont know how to %T", stmt))
}
@@ -637,18 +636,22 @@ func buildRoutePrimitive(ctx *plancontext.PlanningContext, op *operators.Route,
}
func buildInsertPrimitive(
- rb *operators.Route, op operators.Operator, stmt *sqlparser.Insert,
+ ctx *plancontext.PlanningContext,
+ rb *operators.Route,
+ op operators.Operator,
+ stmt *sqlparser.Insert,
hints *queryHints,
) (engine.Primitive, error) {
ins := op.(*operators.Insert)
ic := engine.InsertCommon{
- Opcode: mapToInsertOpCode(rb.Routing.OpCode()),
- Keyspace: rb.Routing.Keyspace(),
- TableName: ins.VTable.Name.String(),
- Ignore: ins.Ignore,
- Generate: autoIncGenerate(ins.AutoIncrement),
- ColVindexes: ins.ColVindexes,
+ Opcode: mapToInsertOpCode(rb.Routing.OpCode()),
+ Keyspace: rb.Routing.Keyspace(),
+ TableName: ins.VTable.Name.String(),
+ Ignore: ins.Ignore,
+ Generate: autoIncGenerate(ins.AutoIncrement),
+ ColVindexes: ins.ColVindexes,
+ FetchLastInsertID: ctx.SemTable.ShouldFetchLastInsertID(),
}
if hints != nil {
ic.MultiShardAutocommit = hints.multiShardAutocommit
@@ -656,8 +659,9 @@ func buildInsertPrimitive(
}
eins := &engine.Insert{
- InsertCommon: ic,
- VindexValues: ins.VindexValues,
+ InsertCommon: ic,
+ VindexValues: ins.VindexValues,
+ FetchLastInsertID: ctx.SemTable.ShouldFetchLastInsertID(),
}
// we would need to generate the query on the fly. The only exception here is
@@ -788,6 +792,7 @@ func createDMLPrimitive(ctx *plancontext.PlanningContext, rb *operators.Route, h
Vindexes: colVindexes,
OwnedVindexQuery: vindexQuery,
RoutingParameters: rp,
+ FetchLastInsertID: ctx.SemTable.ShouldFetchLastInsertID(),
}
if rb.Routing.OpCode() != engine.Unsharded && vindexQuery != "" {
@@ -880,18 +885,18 @@ func transformUnionPlan(ctx *plancontext.PlanningContext, op *operators.Union) (
}
func transformLimit(ctx *plancontext.PlanningContext, op *operators.Limit) (engine.Primitive, error) {
- plan, err := transformToPrimitive(ctx, op.Source)
+ input, err := transformToPrimitive(ctx, op.Source)
if err != nil {
return nil, err
}
- return createLimit(plan, op.AST, ctx.VSchema.Environment(), ctx.VSchema.ConnCollation())
+ return createLimit(ctx, input, op.AST)
}
-func createLimit(input engine.Primitive, limit *sqlparser.Limit, env *vtenv.Environment, coll collations.ID) (engine.Primitive, error) {
+func createLimit(ctx *plancontext.PlanningContext, input engine.Primitive, limit *sqlparser.Limit) (engine.Primitive, error) {
cfg := &evalengine.Config{
- Collation: coll,
- Environment: env,
+ Collation: ctx.VSchema.ConnCollation(),
+ Environment: ctx.VSchema.Environment(),
}
count, err := evalengine.Translate(limit.Rowcount, cfg)
if err != nil {
@@ -906,9 +911,10 @@ func createLimit(input engine.Primitive, limit *sqlparser.Limit, env *vtenv.Envi
}
return &engine.Limit{
- Input: input,
- Count: count,
- Offset: offset,
+ Count: count,
+ Offset: offset,
+ RequireCompleteInput: ctx.SemTable.ShouldFetchLastInsertID(),
+ Input: input,
}, nil
}
diff --git a/go/vt/vtgate/planbuilder/operators/sharded_routing.go b/go/vt/vtgate/planbuilder/operators/sharded_routing.go
index 066cb47d9a9..2c8873dee07 100644
--- a/go/vt/vtgate/planbuilder/operators/sharded_routing.go
+++ b/go/vt/vtgate/planbuilder/operators/sharded_routing.go
@@ -223,6 +223,9 @@ func (tr *ShardedRouting) resetRoutingLogic(ctx *plancontext.PlanningContext) Ro
func (tr *ShardedRouting) searchForNewVindexes(ctx *plancontext.PlanningContext, predicate sqlparser.Expr) (Routing, bool) {
newVindexFound := false
switch node := predicate.(type) {
+ case *sqlparser.BetweenExpr:
+ return tr.planBetweenOp(ctx, node)
+
case *sqlparser.ComparisonExpr:
return tr.planComparison(ctx, node)
@@ -234,6 +237,35 @@ func (tr *ShardedRouting) searchForNewVindexes(ctx *plancontext.PlanningContext,
return nil, newVindexFound
}
+func (tr *ShardedRouting) planBetweenOp(ctx *plancontext.PlanningContext, node *sqlparser.BetweenExpr) (routing Routing, foundNew bool) {
+ column, ok := node.Left.(*sqlparser.ColName)
+ if !ok {
+ return nil, false
+ }
+ var vdValue sqlparser.ValTuple = sqlparser.ValTuple([]sqlparser.Expr{node.From, node.To})
+
+ opcode := func(vindex *vindexes.ColumnVindex) engine.Opcode {
+ if _, ok := vindex.Vindex.(vindexes.Sequential); ok {
+ return engine.Between
+ }
+ return engine.Scatter
+ }
+
+ sequentialVdx := func(vindex *vindexes.ColumnVindex) vindexes.Vindex {
+ if _, ok := vindex.Vindex.(vindexes.Sequential); ok {
+ return vindex.Vindex
+ }
+ // if vindex is not of type Sequential, we can't use this vindex at all
+ return nil
+ }
+
+ val := makeEvalEngineExpr(ctx, vdValue)
+ if val == nil {
+ return nil, false
+ }
+ return nil, tr.haveMatchingVindex(ctx, node, vdValue, column, val, opcode, sequentialVdx)
+}
+
func (tr *ShardedRouting) planComparison(ctx *plancontext.PlanningContext, cmp *sqlparser.ComparisonExpr) (routing Routing, foundNew bool) {
switch cmp.Operator {
case sqlparser.EqualOp:
@@ -332,6 +364,8 @@ func (tr *ShardedRouting) Cost() int {
return 5
case engine.IN:
return 10
+ case engine.Between:
+ return 10
case engine.MultiEqual:
return 10
case engine.Scatter:
@@ -441,6 +475,12 @@ func (tr *ShardedRouting) processMultiColumnVindex(
return newVindexFound
}
+ routeOpcode := opcode(v.ColVindex)
+ vindex := vfunc(v.ColVindex)
+ if vindex == nil || routeOpcode == engine.Scatter {
+ return newVindexFound
+ }
+
var newOption []*VindexOption
for _, op := range v.Options {
if op.Ready {
diff --git a/go/vt/vtgate/planbuilder/plan_test.go b/go/vt/vtgate/planbuilder/plan_test.go
index 7135f4dff29..df813b04dea 100644
--- a/go/vt/vtgate/planbuilder/plan_test.go
+++ b/go/vt/vtgate/planbuilder/plan_test.go
@@ -666,7 +666,7 @@ func (s *planTestSuite) testFile(filename string, vschema *vschemawrapper.VSchem
current := PlanTest{
Comment: tcase.Comment,
Query: tcase.Query,
- SkipE2E: tcase.SkipE2E,
+ SkipE2E: true,
}
vschema.Version = Gen4
out := getPlanOutput(tcase, vschema, render)
diff --git a/go/vt/vtgate/planbuilder/testdata/dml_cases.json b/go/vt/vtgate/planbuilder/testdata/dml_cases.json
index f796b935605..8893b4df0c0 100644
--- a/go/vt/vtgate/planbuilder/testdata/dml_cases.json
+++ b/go/vt/vtgate/planbuilder/testdata/dml_cases.json
@@ -2,12 +2,14 @@
{
"comment": "update table not found",
"query": "update nouser set val = 1",
- "plan": "table nouser not found"
+ "plan": "table nouser not found",
+ "skip_e2e": true
},
{
"comment": "delete table not found",
"query": "delete from nouser",
- "plan": "table nouser not found"
+ "plan": "table nouser not found",
+ "skip_e2e": true
},
{
"comment": "explicit keyspace reference",
@@ -29,7 +31,8 @@
"TablesUsed": [
"main.m1"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "update unsharded",
@@ -51,7 +54,8 @@
"TablesUsed": [
"main.unsharded"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "subqueries in unsharded update",
@@ -73,7 +77,8 @@
"TablesUsed": [
"main.unsharded"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "unsharded union in subquery of unsharded update",
@@ -95,7 +100,8 @@
"TablesUsed": [
"main.unsharded"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "unsharded join in subquery of unsharded update",
@@ -117,7 +123,8 @@
"TablesUsed": [
"main.unsharded"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "update with join subquery",
@@ -139,7 +146,8 @@
"TablesUsed": [
"main.unsharded"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "routing rules: updated of a routed table",
@@ -165,7 +173,8 @@
"TablesUsed": [
"user.user"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "update: routing rules for subquery.",
@@ -188,7 +197,8 @@
"main.unsharded",
"main.unsharded_a"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "delete unsharded",
@@ -210,7 +220,8 @@
"TablesUsed": [
"main.unsharded"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "delete from sequence",
@@ -232,7 +243,8 @@
"TablesUsed": [
"main.seq"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "delete from reference table in unsharded keyspace",
@@ -254,7 +266,8 @@
"TablesUsed": [
"main.unsharded_ref"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "update by primary keyspace id",
@@ -280,7 +293,8 @@
"TablesUsed": [
"user.user"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "update by primary keyspace id with alias",
@@ -306,7 +320,8 @@
"TablesUsed": [
"user.user"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "update by primary keyspace id with parenthesized expression",
@@ -332,7 +347,8 @@
"TablesUsed": [
"user.user"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "update by primary keyspace id with multi-part where clause with parens",
@@ -358,7 +374,8 @@
"TablesUsed": [
"user.user"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "update by primary keyspace id, changing one vindex column",
@@ -390,12 +407,14 @@
"TablesUsed": [
"user.user_metadata"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "update by primary keyspace id, changing same vindex twice",
"query": "update user_metadata set email = 'a', email = 'b' where user_id = 1",
- "plan": "VT03015: column has duplicate set values: 'email'"
+ "plan": "VT03015: column has duplicate set values: 'email'",
+ "skip_e2e": true
},
{
"comment": "update by primary keyspace id, changing multiple vindex columns",
@@ -428,7 +447,8 @@
"TablesUsed": [
"user.user_metadata"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "update by primary keyspace id, changing one vindex column, using order by and limit",
@@ -460,7 +480,8 @@
"TablesUsed": [
"user.user_metadata"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "update changes non owned vindex column",
@@ -492,7 +513,8 @@
"TablesUsed": [
"user.music_extra"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "update by primary keyspace id, stray where clause",
@@ -518,7 +540,8 @@
"TablesUsed": [
"user.user"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "update by primary keyspace id, stray where clause with conversion error",
@@ -544,7 +567,8 @@
"TablesUsed": [
"user.user"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "delete from by primary keyspace id",
@@ -573,7 +597,8 @@
"TablesUsed": [
"user.user"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "multi-table delete with comma join",
@@ -596,7 +621,8 @@
"main.unsharded_a",
"main.unsharded_b"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "multi-table delete with ansi join",
@@ -619,7 +645,8 @@
"main.unsharded_a",
"main.unsharded_b"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "delete with join from subquery",
@@ -641,7 +668,8 @@
"TablesUsed": [
"main.unsharded"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "routing rules: deleted from a routed table",
@@ -670,7 +698,8 @@
"TablesUsed": [
"user.user"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "delete: routing rules for subquery",
@@ -693,7 +722,8 @@
"main.unsharded",
"main.unsharded_a"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "update by lookup",
@@ -719,7 +749,8 @@
"TablesUsed": [
"user.music"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "update multi-table ansi join",
@@ -742,7 +773,8 @@
"main.unsharded_a",
"main.unsharded_b"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "update multi-table comma join",
@@ -765,7 +797,8 @@
"main.unsharded_a",
"main.unsharded_b"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "delete from by lookup",
@@ -794,7 +827,8 @@
"TablesUsed": [
"user.music"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "delete from, no owned vindexes",
@@ -820,7 +854,8 @@
"TablesUsed": [
"user.music_extra"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "simple insert, no values",
@@ -842,7 +877,8 @@
"TablesUsed": [
"main.unsharded"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "simple insert unsharded",
@@ -864,7 +900,8 @@
"TablesUsed": [
"main.unsharded"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "simple upsert unsharded",
@@ -886,7 +923,8 @@
"TablesUsed": [
"main.unsharded"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "unsharded insert, no col list with auto-inc and authoritative column list",
@@ -909,7 +947,8 @@
"TablesUsed": [
"main.unsharded_authoritative"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "sharded upsert with sharding key set to vindex column",
@@ -936,7 +975,8 @@
"TablesUsed": [
"user.music"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "sharded bulk upsert with sharding key set to vindex column",
@@ -963,7 +1003,8 @@
"TablesUsed": [
"user.music"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "insert unsharded with select",
@@ -986,7 +1027,8 @@
"main.unsharded",
"main.unsharded_auto"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "insert unsharded with select with join",
@@ -1009,7 +1051,8 @@
"main.unsharded",
"main.unsharded_auto"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "insert unsharded, invalid value for auto-inc",
@@ -1032,7 +1075,8 @@
"TablesUsed": [
"main.unsharded_auto"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "insert unsharded, column present",
@@ -1055,7 +1099,8 @@
"TablesUsed": [
"main.unsharded_auto"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "insert unsharded, column absent",
@@ -1078,7 +1123,8 @@
"TablesUsed": [
"main.unsharded_auto"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "insert unsharded, column absent",
@@ -1101,7 +1147,8 @@
"TablesUsed": [
"main.unsharded_auto"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "insert unsharded, multi-val",
@@ -1124,7 +1171,8 @@
"TablesUsed": [
"main.unsharded_auto"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "unsharded insert subquery in insert value",
@@ -1146,7 +1194,8 @@
"TablesUsed": [
"main.unsharded"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "sharded insert subquery in insert value",
@@ -1174,7 +1223,8 @@
"TablesUsed": [
"user.user"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "insert into a routed table",
@@ -1202,12 +1252,14 @@
"TablesUsed": [
"user.user"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "insert with mimatched column list",
"query": "insert into user(id) values (1, 2)",
- "plan": "VT03006: column count does not match value count with the row"
+ "plan": "VT03006: column count does not match value count with the row",
+ "skip_e2e": true
},
{
"comment": "insert no column list for sharded authoritative table",
@@ -1232,7 +1284,8 @@
"TablesUsed": [
"user.authoritative"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "insert sharded, no values",
@@ -1260,7 +1313,8 @@
"TablesUsed": [
"user.user"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "insert with one vindex",
@@ -1288,7 +1342,8 @@
"TablesUsed": [
"user.user"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "insert ignore sharded",
@@ -1317,7 +1372,8 @@
"TablesUsed": [
"user.user"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "insert on duplicate key",
@@ -1346,7 +1402,8 @@
"TablesUsed": [
"user.user"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "insert with one vindex and bind var",
@@ -1374,7 +1431,8 @@
"TablesUsed": [
"user.user"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "insert with non vindex",
@@ -1402,7 +1460,8 @@
"TablesUsed": [
"user.user"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "insert with default seq",
@@ -1430,7 +1489,8 @@
"TablesUsed": [
"user.user"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "insert with non vindex bool value",
@@ -1458,7 +1518,8 @@
"TablesUsed": [
"user.user"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "insert with all vindexes supplied",
@@ -1486,7 +1547,8 @@
"TablesUsed": [
"user.user"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "insert for non-vindex autoinc",
@@ -1512,7 +1574,8 @@
"TablesUsed": [
"user.user_extra"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "insert for non-compliant names",
@@ -1537,7 +1600,8 @@
"TablesUsed": [
"user.weird`name"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "unsharded insert from union",
@@ -1560,7 +1624,8 @@
"main.dual",
"main.unsharded"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "insert for non-vindex autoinc, invalid value",
@@ -1586,7 +1651,8 @@
"TablesUsed": [
"user.user_extra"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "insert invalid index value",
@@ -1612,17 +1678,20 @@
"TablesUsed": [
"user.music_extra"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "insert invalid index value",
"query": "insert into music_extra(music_id, user_id) values(1, id)",
- "plan": "cannot lookup column 'id' (column access not supported here)"
+ "plan": "cannot lookup column 'id' (column access not supported here)",
+ "skip_e2e": true
},
{
"comment": "insert invalid table",
"query": "insert into noexist(music_id, user_id) values(1, 18446744073709551616)",
- "plan": "table noexist not found"
+ "plan": "table noexist not found",
+ "skip_e2e": true
},
{
"comment": "insert with multiple rows",
@@ -1650,7 +1719,8 @@
"TablesUsed": [
"user.user"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "insert with query timeout",
@@ -1679,7 +1749,8 @@
"TablesUsed": [
"user.user"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "insert with multiple rows - multi-shard autocommit",
@@ -1708,12 +1779,14 @@
"TablesUsed": [
"user.user"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "insert into a vindex not allowed",
"query": "insert into user_index(id) values(1)",
- "plan": "VT09014: vindex cannot be modified"
+ "plan": "VT09014: vindex cannot be modified",
+ "skip_e2e": true
},
{
"comment": "simple replace unsharded",
@@ -1735,7 +1808,8 @@
"TablesUsed": [
"main.unsharded"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "replace unsharded with select",
@@ -1758,7 +1832,8 @@
"main.unsharded",
"main.unsharded_auto"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "replace unsharded, invalid value for auto-inc",
@@ -1781,7 +1856,8 @@
"TablesUsed": [
"main.unsharded_auto"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "replace unsharded, column present",
@@ -1804,7 +1880,8 @@
"TablesUsed": [
"main.unsharded_auto"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "replace unsharded, column absent",
@@ -1827,7 +1904,8 @@
"TablesUsed": [
"main.unsharded_auto"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "replace unsharded, multi-val",
@@ -1850,12 +1928,14 @@
"TablesUsed": [
"main.unsharded_auto"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "replace invalid table",
"query": "replace into noexist(music_id, user_id) values(1, 18446744073709551616)",
- "plan": "table noexist not found"
+ "plan": "table noexist not found",
+ "skip_e2e": true
},
{
"comment": "insert a row in a multi column vindex table",
@@ -1882,7 +1962,8 @@
"TablesUsed": [
"user.multicolvin"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "insert for overlapped vindex columns",
@@ -1908,7 +1989,8 @@
"TablesUsed": [
"user.overlap_vindex"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "insert multiple rows in a multi column vindex table",
@@ -1935,7 +2017,8 @@
"TablesUsed": [
"user.multicolvin"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "delete row in a multi column vindex table",
@@ -1964,7 +2047,8 @@
"TablesUsed": [
"user.multicolvin"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "update columns of multi column vindex",
@@ -1996,7 +2080,8 @@
"TablesUsed": [
"user.multicolvin"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "update multiple vindexes, with multi column vindex",
@@ -2029,7 +2114,8 @@
"TablesUsed": [
"user.multicolvin"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "update with no primary vindex on where clause (scatter update)",
@@ -2051,7 +2137,8 @@
"TablesUsed": [
"user.user_extra"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "update with target destination",
@@ -2073,7 +2160,8 @@
"TablesUsed": [
"user.user_extra"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "update with no primary vindex on where clause (scatter update) - multi shard autocommit",
@@ -2096,7 +2184,8 @@
"TablesUsed": [
"user.user_extra"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "update with no primary vindex on where clause (scatter update) - query timeout",
@@ -2119,7 +2208,8 @@
"TablesUsed": [
"user.user_extra"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "update with non-comparison expr",
@@ -2141,7 +2231,8 @@
"TablesUsed": [
"user.user_extra"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "update with primary id through IN clause",
@@ -2167,7 +2258,8 @@
"TablesUsed": [
"user.user_extra"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "update with non-unique key",
@@ -2189,7 +2281,8 @@
"TablesUsed": [
"user.user_extra"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "update by lookup with IN clause",
@@ -2211,7 +2304,8 @@
"TablesUsed": [
"user.user_extra"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "update with where clause with parens",
@@ -2233,6 +2327,53 @@
"TablesUsed": [
"user.user_extra"
]
+ },
+ "skip_e2e": true
+ },
+ {
+ "comment": "update with last_insert_id in SET",
+ "query": "update user_extra set col = last_insert_id(123)",
+ "plan": {
+ "QueryType": "UPDATE",
+ "Original": "update user_extra set col = last_insert_id(123)",
+ "Instructions": {
+ "OperatorType": "Update",
+ "Variant": "Scatter",
+ "Keyspace": {
+ "Name": "user",
+ "Sharded": true
+ },
+ "TargetTabletType": "PRIMARY",
+ "FetchLastInsertID": true,
+ "Query": "update user_extra set col = last_insert_id(123)",
+ "Table": "user_extra"
+ },
+ "TablesUsed": [
+ "user.user_extra"
+ ]
+ }
+ },
+ {
+ "comment": "delete with last_insert_id in where",
+ "query": "delete from user_extra where col = last_insert_id(123)",
+ "plan": {
+ "QueryType": "DELETE",
+ "Original": "delete from user_extra where col = last_insert_id(123)",
+ "Instructions": {
+ "OperatorType": "Delete",
+ "Variant": "Scatter",
+ "Keyspace": {
+ "Name": "user",
+ "Sharded": true
+ },
+ "TargetTabletType": "PRIMARY",
+ "FetchLastInsertID": true,
+ "Query": "delete from user_extra where col = last_insert_id(123)",
+ "Table": "user_extra"
+ },
+ "TablesUsed": [
+ "user.user_extra"
+ ]
}
},
{
@@ -2255,7 +2396,8 @@
"TablesUsed": [
"user.user_extra"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "delete with target destination",
@@ -2277,7 +2419,8 @@
"TablesUsed": [
"user.user_extra"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "delete with non-comparison expr",
@@ -2299,7 +2442,8 @@
"TablesUsed": [
"user.user_extra"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "delete from with no index match",
@@ -2321,7 +2465,8 @@
"TablesUsed": [
"user.user_extra"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "delete from with no index match - multi shard autocommit",
@@ -2344,7 +2489,8 @@
"TablesUsed": [
"user.user_extra"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "delete from with no index match - query timeout",
@@ -2367,7 +2513,8 @@
"TablesUsed": [
"user.user_extra"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "delete from with primary id in through IN clause",
@@ -2393,7 +2540,8 @@
"TablesUsed": [
"user.user_extra"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "unsharded update where inner query references outer query",
@@ -2417,7 +2565,8 @@
"main.unsharded_a",
"main.unsharded_b"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "unsharded delete where inner query references outer query",
@@ -2440,7 +2589,8 @@
"main.unsharded",
"main.unsharded_a"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "update vindex value to null",
@@ -2472,7 +2622,8 @@
"TablesUsed": [
"user.user"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "insert using last_insert_id",
@@ -2494,7 +2645,8 @@
"TablesUsed": [
"main.unsharded"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "update vindex value to null with multiple primary keyspace id",
@@ -2526,7 +2678,8 @@
"TablesUsed": [
"user.user"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "update vindex value to null without a where clause",
@@ -2554,7 +2707,8 @@
"TablesUsed": [
"user.user"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "update vindex value to null with complex where clause",
@@ -2582,7 +2736,8 @@
"TablesUsed": [
"user.user"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "delete from user by primary keyspace id with in clause",
@@ -2611,7 +2766,8 @@
"TablesUsed": [
"user.user"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "delete from user by complex expression",
@@ -2636,7 +2792,8 @@
"TablesUsed": [
"user.user"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "delete from user without a where clause",
@@ -2661,7 +2818,8 @@
"TablesUsed": [
"user.user"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "delete with single table targets",
@@ -2690,7 +2848,8 @@
"TablesUsed": [
"user.music"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "scatter update table with owned vindexes without changing lookup vindex",
@@ -2712,7 +2871,8 @@
"TablesUsed": [
"user.user"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "scatter delete with owned lookup vindex",
@@ -2737,7 +2897,8 @@
"TablesUsed": [
"user.user"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "update multi column vindex, without values for all the vindex columns",
@@ -2769,7 +2930,8 @@
"TablesUsed": [
"user.multicolvin"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "update with binary value",
@@ -2801,7 +2963,8 @@
"TablesUsed": [
"user.user"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "delete with binary value",
@@ -2830,7 +2993,8 @@
"TablesUsed": [
"user.user"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "delete with shard targeting",
@@ -2855,7 +3019,8 @@
"TablesUsed": [
"user.user"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "update with shard targeting",
@@ -2883,7 +3048,8 @@
"TablesUsed": [
"user.user"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "update with shard targeting without vindex",
@@ -2905,7 +3071,8 @@
"TablesUsed": [
"user.user_extra"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "multi-table delete with single table",
@@ -2930,22 +3097,26 @@
"TablesUsed": [
"user.user"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "delete with unknown reference",
"query": "delete music from user where id = 1",
- "plan": "VT03003: unknown table 'music' in MULTI DELETE"
+ "plan": "VT03003: unknown table 'music' in MULTI DELETE",
+ "skip_e2e": true
},
{
"comment": "delete with derived tables",
"query": "delete music from (select * from user) music where id = 1",
- "plan": "VT03004: the target table music of the DELETE is not updatable"
+ "plan": "VT03004: the target table music of the DELETE is not updatable",
+ "skip_e2e": true
},
{
"comment": "delete with derived tables with unknown table",
"query": "delete user from (select * from user) music where id = 1",
- "plan": "VT03003: unknown table 'user' in MULTI DELETE"
+ "plan": "VT03003: unknown table 'user' in MULTI DELETE",
+ "skip_e2e": true
},
{
"comment": "INSERT INTO main.user_privacy_consents (user_id, accepted_at) SELECT user_id, accepted_at FROM (SELECT 1 as user_id, 1629194864 as accepted_at) AS tmp WHERE NOT EXISTS (SELECT user_id FROM main.user_privacy_consents WHERE user_id = 1)",
@@ -2968,7 +3139,8 @@
"main.dual",
"main.user_privacy_consents"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "Delete on backfilling unique lookup vindex should be a scatter",
@@ -2993,7 +3165,8 @@
"TablesUsed": [
"zlookup_unique.t1"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "Update on backfilling unique lookup vindex should be a scatter",
@@ -3021,7 +3194,8 @@
"TablesUsed": [
"zlookup_unique.t1"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "Delete on backfilling and non-backfilling unique lookup vindexes should be a delete equal",
@@ -3050,7 +3224,8 @@
"TablesUsed": [
"zlookup_unique.t1"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "Update on backfilling and non-backfilling unique lookup vindexes should be an equal",
@@ -3082,7 +3257,8 @@
"TablesUsed": [
"zlookup_unique.t1"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "Delete EQUAL and IN on backfilling and non-backfilling unique lookup vindexes should be a delete IN",
@@ -3111,7 +3287,8 @@
"TablesUsed": [
"zlookup_unique.t1"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "Update EQUAL and IN on backfilling and non-backfilling unique lookup vindexes should be an update IN",
@@ -3143,7 +3320,8 @@
"TablesUsed": [
"zlookup_unique.t1"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "update with alias table",
@@ -3171,7 +3349,8 @@
"TablesUsed": [
"user.user"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "delete with alias table",
@@ -3196,7 +3375,8 @@
"TablesUsed": [
"user.user"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "update with a multicol vindex",
@@ -3223,7 +3403,8 @@
"TablesUsed": [
"user.multicol_tbl"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "update with a multicol vindex - reverse order",
@@ -3250,7 +3431,8 @@
"TablesUsed": [
"user.multicol_tbl"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "update with a multicol vindex using an IN clause",
@@ -3277,7 +3459,8 @@
"TablesUsed": [
"user.multicol_tbl"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "update with a multicol vindex using an IN clause",
@@ -3304,7 +3487,8 @@
"TablesUsed": [
"user.multicol_tbl"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "delete with a multicol vindex",
@@ -3334,7 +3518,8 @@
"TablesUsed": [
"user.multicol_tbl"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "delete with a multicol vindex - reverse order",
@@ -3364,7 +3549,8 @@
"TablesUsed": [
"user.multicol_tbl"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "delete with a multicol vindex using an IN clause",
@@ -3394,7 +3580,8 @@
"TablesUsed": [
"user.multicol_tbl"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "delete with a multicol vindex using an IN clause",
@@ -3424,7 +3611,8 @@
"TablesUsed": [
"user.multicol_tbl"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "update with multicol and an owned vindex which changes",
@@ -3457,7 +3645,8 @@
"TablesUsed": [
"user.multicol_tbl"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "update with routing using non-unique lookup vindex",
@@ -3483,7 +3672,8 @@
"TablesUsed": [
"user.multicol_tbl"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "update with routing using subsharding column",
@@ -3509,7 +3699,8 @@
"TablesUsed": [
"user.multicol_tbl"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "update with routing using subsharding column on lookup vindex",
@@ -3541,7 +3732,8 @@
"TablesUsed": [
"user.multicol_tbl"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "update with routing using subsharding column with in query",
@@ -3573,7 +3765,8 @@
"TablesUsed": [
"user.multicol_tbl"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "update with routing using subsharding column with in query as lower cost over lookup vindex",
@@ -3599,7 +3792,8 @@
"TablesUsed": [
"user.multicol_tbl"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "delete with routing using non-unique lookup vindex",
@@ -3628,7 +3822,8 @@
"TablesUsed": [
"user.multicol_tbl"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "delete with routing using subsharding column",
@@ -3657,7 +3852,8 @@
"TablesUsed": [
"user.multicol_tbl"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "delete with routing using subsharding column with in query",
@@ -3686,7 +3882,8 @@
"TablesUsed": [
"user.multicol_tbl"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "delete with routing using subsharding column with in query as lower cost over lookup vindex",
@@ -3715,7 +3912,8 @@
"TablesUsed": [
"user.multicol_tbl"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "insert using select with simple table.",
@@ -3754,22 +3952,26 @@
"user.music",
"user.user"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "insert using select with more columns in insert",
"query": "insert into music(id, user_id) select 1",
- "plan": "VT03006: column count does not match value count with the row"
+ "plan": "VT03006: column count does not match value count with the row",
+ "skip_e2e": true
},
{
"comment": "insert using select with more columns in select",
"query": "insert into music(id, user_id) select id, count(user_id), sum(user_id) from user group by id",
- "plan": "VT03006: column count does not match value count with the row"
+ "plan": "VT03006: column count does not match value count with the row",
+ "skip_e2e": true
},
{
"comment": "insert using select with more columns in select after accounting for star column",
"query": "insert into music(id, user_id) select id, *, 2 from user",
- "plan": "VT03006: column count does not match value count with the row"
+ "plan": "VT03006: column count does not match value count with the row",
+ "skip_e2e": true
},
{
"comment": "insert using select with auto-inc column using vitess sequence, sequence column not present",
@@ -3808,7 +4010,8 @@
"user.user",
"user.user_extra"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "insert using select with auto-inc column using vitess sequence, sequence column present",
@@ -3847,7 +4050,8 @@
"user.user",
"user.user_extra"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "sharded insert from select",
@@ -3888,7 +4092,8 @@
"main.dual",
"user.user"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "insert using select with sharding column is autoinc and not present in the insert column query",
@@ -3929,12 +4134,14 @@
"main.dual",
"user.user"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "insert using select with sharding column is not an autoinc and not present in the insert column query",
"query": "insert into user_extra(pattern) SELECT 1",
- "plan": "VT09003: INSERT query does not have primary vindex column 'user_id' in the column list"
+ "plan": "VT09003: INSERT query does not have primary vindex column 'user_id' in the column list",
+ "skip_e2e": true
},
{
"comment": "sharded same keyspace",
@@ -3973,7 +4180,8 @@
"user.user",
"user.user_extra"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "unsharded same keyspace",
@@ -3996,7 +4204,8 @@
"main.unsharded",
"main.unsharded_auto"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "sharded different keyspace",
@@ -4035,7 +4244,8 @@
"user.user_extra",
"zlookup_unique.t1"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "sharded insert table, unsharded select table",
@@ -4074,7 +4284,8 @@
"main_2.unsharded_tab",
"user.user_extra"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "unsharded different keyspace",
@@ -4109,7 +4320,8 @@
"main.unsharded",
"main_2.unsharded_tab"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "unsharded insert table, sharded select table",
@@ -4144,7 +4356,8 @@
"main.unsharded",
"zlookup_unique.t1"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "unsharded subquery in sharded update, not the same keyspace between outer and inner",
@@ -4189,7 +4402,8 @@
"main.unsharded",
"user.user"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "sharded subquery in unsharded update, not the same keyspace",
@@ -4234,7 +4448,8 @@
"main.unsharded",
"user.user"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "sharded join unsharded subqueries in unsharded update",
@@ -4305,7 +4520,8 @@
"main.unsharded",
"user.user"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "sharded update with sub query where the sources can be merged into a single query",
@@ -4332,7 +4548,8 @@
"user.user",
"user.user_extra"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "merge through correlated subquery",
@@ -4359,7 +4576,8 @@
"user.user",
"user.user_extra"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "merge through correlated subquery #2",
@@ -4382,7 +4600,8 @@
"user.user",
"user.user_extra"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "all defaults empty column, empty values",
@@ -4407,12 +4626,14 @@
"TablesUsed": [
"user.authoritative"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "vexplain all dml without any directive should fail",
"query": "vexplain all delete from user",
- "plan": "VT09008: vexplain queries/all will actually run queries"
+ "plan": "VT09008: vexplain queries/all will actually run queries",
+ "skip_e2e": true
},
{
"comment": "vexplain dml with actually_run_query directive",
@@ -4443,7 +4664,8 @@
"TablesUsed": [
"user.user"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "explain dml with actually_run_query directive - 2",
@@ -4474,7 +4696,8 @@
"TablesUsed": [
"user.user"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "delete with join from multi table join subquery",
@@ -4497,7 +4720,8 @@
"main.unsharded",
"main.unsharded_b"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "update with routing using multi column vindex",
@@ -4523,7 +4747,8 @@
"TablesUsed": [
"user.user"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "delete with routing using multi column vindex",
@@ -4552,7 +4777,8 @@
"TablesUsed": [
"user.user"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "insert into ref; TODO(maxeng) is this a bug?",
@@ -4574,7 +4800,8 @@
"TablesUsed": [
"user.ref"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "update using last_insert_id with an argument",
@@ -4596,7 +4823,8 @@
"TablesUsed": [
"main.m1"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "unsharded update query with comment directive",
@@ -4619,7 +4847,8 @@
"TablesUsed": [
"main.unsharded"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "unsharded insert query with comment directive",
@@ -4642,7 +4871,8 @@
"TablesUsed": [
"main.unsharded"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "insert with select using same tables, cannot stream parallel",
@@ -4685,7 +4915,8 @@
"TablesUsed": [
"user.music"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "insert + lookup vindex + auto increment on lookup column - not provided",
@@ -4712,7 +4943,8 @@
"TablesUsed": [
"user.mixed_tbl"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "insert + lookup vindex + auto increment on lookup column - partially provided",
@@ -4739,7 +4971,8 @@
"TablesUsed": [
"user.mixed_tbl"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "insert + lookup vindex + auto increment on lookup column + select - not provided",
@@ -4783,7 +5016,8 @@
"user.mixed_tbl",
"user.user"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "insert + lookup vindex + auto increment on lookup column + select - provided",
@@ -4827,12 +5061,14 @@
"user.mixed_tbl",
"user.user"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "insert into a vindex not allowed",
"query": "insert into user_index(id) values(1)",
- "plan": "VT09014: vindex cannot be modified"
+ "plan": "VT09014: vindex cannot be modified",
+ "skip_e2e": true
},
{
"comment": "insert with select takes shared lock",
@@ -4873,32 +5109,38 @@
"TablesUsed": [
"user.user"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "Unsupported INSERT statement with a target destination",
"query": "insert into `user[-]`.user_metadata (a, b) values (1,2)",
- "plan": "VT09017: INSERT with a target destination is not allowed"
+ "plan": "VT09017: INSERT with a target destination is not allowed",
+ "skip_e2e": true
},
{
"comment": "Unsupported delete statement with a replica target destination",
"query": "DELETE FROM `user[-]@replica`.user_metadata limit 1",
- "plan": "VT09002: delete statement with a replica target"
+ "plan": "VT09002: delete statement with a replica target",
+ "skip_e2e": true
},
{
"comment": "Unsupported update statement with a replica target destination",
"query": "update `user[-]@replica`.user_metadata set id=2",
- "plan": "VT09002: update statement with a replica target"
+ "plan": "VT09002: update statement with a replica target",
+ "skip_e2e": true
},
{
"comment": "insert row values smaller than number of columns",
"query": "insert into user(one, two, three, four) values (1, 2, 3)",
- "plan": "VT03006: column count does not match value count with the row"
+ "plan": "VT03006: column count does not match value count with the row",
+ "skip_e2e": true
},
{
"comment": "insert row values greater than number of columns",
"query": "insert into user(one, two, three) values (1, 2, 3, 4)",
- "plan": "VT03006: column count does not match value count with the row"
+ "plan": "VT03006: column count does not match value count with the row",
+ "skip_e2e": true
},
{
"comment": "insert on duplicate key update with database qualifier",
@@ -4925,7 +5167,8 @@
"TablesUsed": [
"user.music"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "delete from reference table - query send to source table",
@@ -4947,7 +5190,8 @@
"TablesUsed": [
"main.source_of_ref"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "delete from reference table - no source",
@@ -4969,7 +5213,8 @@
"TablesUsed": [
"user.ref"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "delete by target destination with limit",
@@ -4994,7 +5239,8 @@
"TablesUsed": [
"user.user"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "delete sharded table with join with reference table",
@@ -5020,7 +5266,8 @@
"user.ref_with_source",
"user.user"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "delete sharded table with join with another sharded table on vindex column",
@@ -5046,7 +5293,8 @@
"user.music",
"user.user"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "multi delete multi table",
@@ -5122,7 +5370,8 @@
"user.user",
"user.user_extra"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "multi delete multi table with alias",
@@ -5194,7 +5443,8 @@
"user.music",
"user.user"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "reverse the join order for delete",
@@ -5266,7 +5516,8 @@
"user.music",
"user.user"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "multi table delete with join on vindex column",
@@ -5292,7 +5543,8 @@
"user.music",
"user.user"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "delete 3 way join with sharding key and primary key same",
@@ -5365,7 +5617,8 @@
"user.user",
"user.user_extra"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "delete 3 way join with sharding key and primary key different",
@@ -5438,7 +5691,8 @@
"user.user",
"user.user_extra"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "sharded delete with limit clause",
@@ -5493,7 +5747,8 @@
"TablesUsed": [
"user.user"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "sharded delete with order by and limit clause",
@@ -5549,7 +5804,8 @@
"TablesUsed": [
"user.user"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "update with limit clause",
@@ -5601,7 +5857,8 @@
"TablesUsed": [
"user.user"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "update a vindex column with limit",
@@ -5659,7 +5916,8 @@
"TablesUsed": [
"user.user"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "update with multi table join with single target",
@@ -5738,7 +5996,8 @@
"user.user",
"user.user_extra"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "update with multi table join with single target modifying lookup vindex",
@@ -5817,7 +6076,8 @@
"user.user",
"user.user_extra"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "update with multi table join with single target having dependent column update",
@@ -5893,7 +6153,8 @@
"user.user",
"user.user_extra"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "update with multi table join with single target having multiple dependent column update",
@@ -5969,7 +6230,8 @@
"user.user",
"user.user_extra"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "update with multi table join with multi target having dependent column update",
@@ -6068,17 +6330,20 @@
"user.user",
"user.user_extra"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "update with multi table reference with multi target update on a derived table",
"query": "update ignore (select foo, col, bar from user) u, music m set u.foo = 21, u.bar = 'abc' where u.col = m.col",
- "plan": "VT03032: the target table (select foo, col, bar from `user`) as u of the UPDATE is not updatable"
+ "plan": "VT03032: the target table (select foo, col, bar from `user`) as u of the UPDATE is not updatable",
+ "skip_e2e": true
},
{
"comment": "update with derived table",
"query": "update (select id from user) as u set id = 4",
- "plan": "VT03032: the target table (select id from `user`) as u of the UPDATE is not updatable"
+ "plan": "VT03032: the target table (select id from `user`) as u of the UPDATE is not updatable",
+ "skip_e2e": true
},
{
"comment": "Delete with routed table on music",
@@ -6103,7 +6368,8 @@
"TablesUsed": [
"user.music"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "Update with routed table on music",
@@ -6125,7 +6391,8 @@
"TablesUsed": [
"user.music"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "Insert with routed table on music",
@@ -6151,7 +6418,8 @@
"TablesUsed": [
"user.music"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "sharded subquery in sharded delete",
@@ -6207,7 +6475,8 @@
"user.music",
"user.user"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "unsharded subquery in sharded delete",
@@ -6255,7 +6524,8 @@
"main.unsharded",
"user.user"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "sharded subquery in unsharded delete",
@@ -6300,7 +6570,8 @@
"main.unsharded",
"user.user"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "sharded subquery in unsharded subquery in unsharded delete",
@@ -6367,7 +6638,8 @@
"main.unsharded",
"user.user"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "sharded join unsharded subquery in unsharded delete",
@@ -6438,7 +6710,8 @@
"main.unsharded",
"user.user"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "multi target delete on sharded table",
@@ -6530,7 +6803,8 @@
"user.music",
"user.user"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "delete with multi-table targets",
@@ -6625,7 +6899,8 @@
"user.music",
"user.user"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "multi table delete with 2 sharded tables join on vindex column",
@@ -6694,7 +6969,8 @@
"user.music",
"user.user"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "multi table delete with 2 sharded tables join on non-vindex column",
@@ -6785,7 +7061,8 @@
"user.music",
"user.user"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "multi target delete with composite primary key having single column vindex",
@@ -6851,7 +7128,8 @@
"user.user",
"user.user_extra"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "multi target delete with composite primary key with lookup vindex as sharding column",
@@ -6917,7 +7195,8 @@
"ordering.order",
"ordering.order_event"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "update with multi table reference with multi target update",
@@ -7002,7 +7281,8 @@
"user.music",
"user.user"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "RowAlias in INSERT",
@@ -7028,7 +7308,8 @@
"TablesUsed": [
"user.authoritative"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "RowAlias with explicit columns in INSERT",
@@ -7054,7 +7335,8 @@
"TablesUsed": [
"user.authoritative"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "RowAlias in INSERT (no column list)",
@@ -7080,7 +7362,8 @@
"TablesUsed": [
"user.authoritative"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "RowAlias with explicit columns in INSERT (no column list)",
@@ -7106,6 +7389,7 @@
"TablesUsed": [
"user.authoritative"
]
- }
+ },
+ "skip_e2e": true
}
]
diff --git a/go/vt/vtgate/planbuilder/testdata/filter_cases.json b/go/vt/vtgate/planbuilder/testdata/filter_cases.json
index edce4ebd0cb..72b6c4ddd46 100644
--- a/go/vt/vtgate/planbuilder/testdata/filter_cases.json
+++ b/go/vt/vtgate/planbuilder/testdata/filter_cases.json
@@ -699,7 +699,8 @@
"TablesUsed": [
"user.user"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "Composite IN: RHS not tuple",
@@ -722,7 +723,8 @@
"user.music",
"user.user"
]
- }
+ },
+ "skip_e2e":true
},
{
"comment": "Composite IN: RHS has no simple values",
@@ -970,7 +972,8 @@
"TablesUsed": [
"user.user"
]
- }
+ },
+ "skip_e2e":true
},
{
"comment": "Merging subqueries should remove keyspace from query",
@@ -1095,7 +1098,8 @@
"TablesUsed": [
"user.user"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "Multi-table unique vindex constraint",
@@ -1252,7 +1256,8 @@
"user.user",
"user.user_extra"
]
- }
+ },
+ "skip_e2e":true
},
{
"comment": "Multi-route unique vindex route on both routes",
@@ -1279,7 +1284,8 @@
"user.user",
"user.user_extra"
]
- }
+ },
+ "skip_e2e":true
},
{
"comment": "Multi-route with cross-route constraint",
@@ -1328,7 +1334,8 @@
"user.user",
"user.user_extra"
]
- }
+ },
+ "skip_e2e":true
},
{
"comment": "Multi-route with non-route constraint, should use first route.",
@@ -1373,7 +1380,8 @@
"user.user",
"user.user_extra"
]
- }
+ },
+ "skip_e2e":true
},
{
"comment": "Route with multiple route constraints, SelectIN is the best constraint.",
@@ -1654,7 +1662,8 @@
"main.unsharded",
"user.user"
]
- }
+ },
+ "skip_e2e":true
},
{
"comment": "routing rules: choose the redirected table",
@@ -1680,7 +1689,8 @@
"TablesUsed": [
"user.user"
]
- }
+ },
+ "skip_e2e":true
},
{
"comment": "subquery",
@@ -1729,7 +1739,8 @@
"user.user",
"user.user_extra"
]
- }
+ },
+ "skip_e2e":true
},
{
"comment": "correlated subquery merge-able into a route of a join tree",
@@ -1778,7 +1789,8 @@
"user.user",
"user.user_extra"
]
- }
+ },
+ "skip_e2e":true
},
{
"comment": "ensure subquery reordering gets us a better plan",
@@ -1824,7 +1836,8 @@
"user.user",
"user.user_extra"
]
- }
+ },
+ "skip_e2e":true
},
{
"comment": "nested subquery",
@@ -1873,7 +1886,8 @@
"user.user",
"user.user_extra"
]
- }
+ },
+ "skip_e2e":true
},
{
"comment": "Correlated subquery in where clause",
@@ -1896,7 +1910,8 @@
"user.user",
"user.user_extra"
]
- }
+ },
+ "skip_e2e":true
},
{
"comment": "outer and inner subquery route by same int val",
@@ -1923,7 +1938,8 @@
"user.user",
"user.user_extra"
]
- }
+ },
+ "skip_e2e":true
},
{
"comment": "outer and inner subquery route by same str val",
@@ -1950,7 +1966,8 @@
"user.user",
"user.user_extra"
]
- }
+ },
+ "skip_e2e":true
},
{
"comment": "outer and inner subquery route by same val arg",
@@ -1977,12 +1994,14 @@
"user.user",
"user.user_extra"
]
- }
+ },
+ "skip_e2e":true
},
{
"comment": "unresolved symbol in inner subquery.",
"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 and foo.id = 1)",
- "plan": "column 'foo.id' not found"
+ "plan": "column 'foo.id' not found",
+ "skip_e2e":true
},
{
"comment": "outer and inner subquery route by same outermost column value",
@@ -2005,7 +2024,8 @@
"user.user",
"user.user_extra"
]
- }
+ },
+ "skip_e2e":true
},
{
"comment": "cross-shard subquery in IN clause.\n# Note the improved Underlying plan as SelectIN.",
@@ -2290,7 +2310,8 @@
"TablesUsed": [
"user.user"
]
- }
+ },
+ "skip_e2e":true
},
{
"comment": "routing rules subquery pullout",
@@ -2339,7 +2360,8 @@
"main.unsharded",
"user.user"
]
- }
+ },
+ "skip_e2e":true
},
{
"comment": "Case preservation test",
@@ -2366,7 +2388,8 @@
"user.user",
"user.user_extra"
]
- }
+ },
+ "skip_e2e":true
},
{
"comment": "database() call in where clause.",
@@ -2649,7 +2672,8 @@
"user.user",
"user.user_extra"
]
- }
+ },
+ "skip_e2e":true
},
{
"comment": "solving LIKE query with a CFC prefix vindex",
@@ -2701,7 +2725,8 @@
"TablesUsed": [
"user.samecolvin"
]
- }
+ },
+ "skip_e2e":true
},
{
"comment": "non unique predicate on vindex",
@@ -2819,7 +2844,8 @@
"user.user",
"user.user_extra"
]
- }
+ },
+ "skip_e2e":true
},
{
"comment": "SelectDBA with uncorrelated subqueries",
@@ -2838,7 +2864,8 @@
"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`"
}
- }
+ },
+ "skip_e2e": true
},
{
"comment": "SelectReference with uncorrelated subqueries",
@@ -3040,7 +3067,8 @@
"user.user",
"user.user_extra"
]
- }
+ },
+ "skip_e2e":true
},
{
"comment": "The outer and second inner are SelectEqualUnique with same Vindex value, the first inner has different Vindex value",
@@ -3094,7 +3122,8 @@
"user.user",
"user.user_extra"
]
- }
+ },
+ "skip_e2e":true
},
{
"comment": "two correlated subqueries that can be merge in a single route",
@@ -3117,7 +3146,8 @@
"user.user",
"user.user_extra"
]
- }
+ },
+ "skip_e2e":true
},
{
"comment": "transitive closures for the win",
@@ -3166,7 +3196,8 @@
"user.user",
"user.user_extra"
]
- }
+ },
+ "skip_e2e":true
},
{
"comment": "not supported transitive closures with equality inside of an OR",
@@ -3215,7 +3246,8 @@
"user.user",
"user.user_extra"
]
- }
+ },
+ "skip_e2e":true
},
{
"comment": "routing rules subquery merge with alias",
@@ -3237,7 +3269,8 @@
"TablesUsed": [
"user.user"
]
- }
+ },
+ "skip_e2e":true
},
{
"comment": "left join where clauses where we can optimize into an inner join",
@@ -3282,12 +3315,14 @@
"user.user",
"user.user_extra"
]
- }
+ },
+ "skip_e2e":true
},
{
"comment": "this query lead to a nil pointer error",
"query": "select user.id from user left join user_extra on user.col = user_extra.col where foo(user_extra.foobar)",
- "plan": "expr cannot be translated, not supported: foo(user_extra.foobar)"
+ "plan": "expr cannot be translated, not supported: foo(user_extra.foobar)",
+ "skip_e2e" :true
},
{
"comment": "filter after outer join",
@@ -3339,7 +3374,8 @@
"user.user",
"user.user_extra"
]
- }
+ },
+ "skip_e2e":true
},
{
"comment": "subquery on other table",
@@ -3994,7 +4030,8 @@
"user.user",
"user.user_extra"
]
- }
+ },
+ "skip_e2e":true
},
{
"comment": "conditions following a null safe comparison operator can be used for routing",
@@ -4444,7 +4481,8 @@
"TablesUsed": [
"user.user"
]
- }
+ },
+ "skip_e2e":true
},
{
"comment": "two predicates that mean the same thing",
@@ -4530,7 +4568,8 @@
"main.unsharded",
"user.user"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "push filter under aggregation",
@@ -4598,7 +4637,8 @@
"user.user",
"user.user_extra"
]
- }
+ },
+ "skip_e2e":true
},
{
"comment": "query that would time out because planning was too slow",
@@ -4628,7 +4668,8 @@
"TablesUsed": [
"user.user"
]
- }
+ },
+ "skip_e2e":true
},
{
"comment": "union inside subquery. all routes can be merged by literal value",
@@ -4682,7 +4723,8 @@
"TablesUsed": [
"user.user"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "list args: single column vindex on non-zero offset",
@@ -4708,7 +4750,8 @@
"TablesUsed": [
"user.user"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "list args: multi column vindex",
@@ -4735,7 +4778,8 @@
"TablesUsed": [
"user.multicol_tbl"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "list args: multi column vindex - subshard",
@@ -4761,7 +4805,8 @@
"TablesUsed": [
"user.multicol_tbl"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "list args: multi column vindex - more columns",
@@ -4788,7 +4833,8 @@
"TablesUsed": [
"user.multicol_tbl"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "list args: multi column vindex - columns rearranged",
@@ -4815,7 +4861,8 @@
"TablesUsed": [
"user.multicol_tbl"
]
- }
+ },
+ "skip_e2e": true
},
{
"comment": "order by with filter removing the keyspace from order by",
@@ -4920,5 +4967,148 @@
"user.authoritative"
]
}
+ },
+ {
+ "comment": "Between clause on primary indexed id column (binary vindex on id)",
+ "query": "select id from unq_binary_idx where id between 1 and 5",
+ "plan": {
+ "QueryType": "SELECT",
+ "Original": "select id from unq_binary_idx where id between 1 and 5",
+ "Instructions": {
+ "OperatorType": "Route",
+ "Variant": "Between",
+ "Keyspace": {
+ "Name": "user",
+ "Sharded": true
+ },
+ "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)"
+ ],
+ "Vindex": "binary"
+ },
+ "TablesUsed": [
+ "user.unq_binary_idx"
+ ]
+ }
+ },
+{
+ "comment": "Between clause on customer.id column (xxhash vindex on id)",
+ "query": "select id from customer where id between 1 and 5",
+ "plan": {
+ "QueryType": "SELECT",
+ "Original": "select id from customer where id between 1 and 5",
+ "Instructions": {
+ "OperatorType": "Route",
+ "Variant": "Scatter",
+ "Keyspace": {
+ "Name": "user",
+ "Sharded": true
+ },
+ "FieldQuery": "select id from customer where 1 != 1",
+ "Query": "select id from customer where id between 1 and 5",
+ "Table": "customer"
+ },
+ "TablesUsed": [
+ "user.customer"
+ ]
+ }
+ },
+{
+ "comment": "Between clause on col1 column (there is no vindex on this column)",
+ "query": "select id, col1 from unq_binary_idx where col1 between 10 and 50",
+ "plan": {
+ "QueryType": "SELECT",
+ "Original": "select id, col1 from unq_binary_idx where col1 between 10 and 50",
+ "Instructions": {
+ "OperatorType": "Route",
+ "Variant": "Scatter",
+ "Keyspace": {
+ "Name": "user",
+ "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"
+ },
+ "TablesUsed": [
+ "user.unq_binary_idx"
+ ]
+ }
+},
+{
+ "comment": "Between clause on multicolumn vindex (cola,colb)",
+ "query": "select cola,colb,colc from multicol_tbl where cola between 1 and 5",
+ "plan": {
+ "QueryType": "SELECT",
+ "Original": "select cola,colb,colc from multicol_tbl where cola between 1 and 5",
+ "Instructions": {
+ "OperatorType": "Route",
+ "Variant": "Scatter",
+ "Keyspace": {
+ "Name": "user",
+ "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"
+ },
+ "TablesUsed": [
+ "user.multicol_tbl"
+ ]
+ }
+},
+{
+ "comment": "Between clause on a binary vindex field with values from a different table",
+ "query": "select s.oid,s.col1, se.colb from sales s join sales_extra se on s.col1 = se.cola where s.oid between se.start and se.end",
+ "plan": {
+ "QueryType": "SELECT",
+ "Original": "select s.oid,s.col1, se.colb from sales s join sales_extra se on s.col1 = se.cola where s.oid between se.start and se.end",
+ "Instructions": {
+ "OperatorType": "Join",
+ "Variant": "Join",
+ "JoinColumnIndexes": "R:0,R:1,L:0",
+ "JoinVars": {
+ "se_cola": 1,
+ "se_end": 3,
+ "se_start": 2
+ },
+ "TableName": "sales_extra_sales",
+ "Inputs": [
+ {
+ "OperatorType": "Route",
+ "Variant": "Scatter",
+ "Keyspace": {
+ "Name": "user",
+ "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"
+ },
+ {
+ "OperatorType": "Route",
+ "Variant": "Between",
+ "Keyspace": {
+ "Name": "user",
+ "Sharded": true
+ },
+ "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)"
+ ],
+ "Vindex": "binary"
+ }
+ ]
+ },
+ "TablesUsed": [
+ "user.sales",
+ "user.sales_extra"
+ ]
}
+}
]
diff --git a/go/vt/vtgate/planbuilder/testdata/sampledata/user.sql b/go/vt/vtgate/planbuilder/testdata/sampledata/user.sql
new file mode 100644
index 00000000000..044a1ee140d
--- /dev/null
+++ b/go/vt/vtgate/planbuilder/testdata/sampledata/user.sql
@@ -0,0 +1,14 @@
+INSERT INTO sales (oid, col1)
+ VALUES (1, 'a_1');
+
+INSERT INTO sales_extra(colx, cola, colb, start, end)
+VALUES (11, 'a_1', 'b_1',0, 500);
+
+INSERT INTO sales_extra(colx, cola, colb, start, end)
+VALUES (12, 'a_2', 'b_2',500, 1000);
+
+INSERT INTO sales_extra(colx, cola, colb, start, end)
+VALUES (13, 'a_3', 'b_3',1000, 1500);
+
+INSERT INTO sales_extra(colx, cola, colb, start, end)
+VALUES (14, 'a_4', 'b_4',1500, 2000);
\ No newline at end of file
diff --git a/go/vt/vtgate/planbuilder/testdata/schemas/main.sql b/go/vt/vtgate/planbuilder/testdata/schemas/main.sql
index 8c15b99218c..fb03b69419b 100644
--- a/go/vt/vtgate/planbuilder/testdata/schemas/main.sql
+++ b/go/vt/vtgate/planbuilder/testdata/schemas/main.sql
@@ -1,12 +1,26 @@
CREATE TABLE `unsharded` (
- `id` INT NOT NULL PRIMARY KEY,
- `col1` VARCHAR(255) DEFAULT NULL,
- `col2` VARCHAR(255) DEFAULT NULL,
- `name` VARCHAR(255) DEFAULT NULL
+ `id` INT NOT NULL PRIMARY KEY,
+ `col` VARCHAR(255) DEFAULT NULL,
+ `col1` VARCHAR(255) DEFAULT NULL,
+ `col2` VARCHAR(255) DEFAULT NULL,
+ `name` VARCHAR(255) DEFAULT NULL,
+ `baz` INT
);
CREATE TABLE `unsharded_auto` (
- `id` INT NOT NULL PRIMARY KEY,
+ `id` INT NOT NULL PRIMARY KEY,
`col1` VARCHAR(255) DEFAULT NULL,
`col2` VARCHAR(255) DEFAULT NULL
+);
+
+CREATE TABLE `unsharded_a` (
+ `id` INT NOT NULL PRIMARY KEY,
+ `col` VARCHAR(255) DEFAULT NULL,
+ `name` VARCHAR(255) DEFAULT NULL
+);
+
+CREATE TABLE `unsharded_b` (
+ `id` INT NOT NULL PRIMARY KEY,
+ `col` VARCHAR(255) DEFAULT NULL,
+ `name` VARCHAR(255) DEFAULT NULL
);
\ No newline at end of file
diff --git a/go/vt/vtgate/planbuilder/testdata/schemas/user.sql b/go/vt/vtgate/planbuilder/testdata/schemas/user.sql
index 55f4078557a..818d2508069 100644
--- a/go/vt/vtgate/planbuilder/testdata/schemas/user.sql
+++ b/go/vt/vtgate/planbuilder/testdata/schemas/user.sql
@@ -1,12 +1,25 @@
CREATE TABLE user
(
- id INT PRIMARY KEY,
- col BIGINT,
- predef1 VARCHAR(255),
- predef2 VARCHAR(255),
- textcol1 VARCHAR(255),
- intcol BIGINT,
- textcol2 VARCHAR(255)
+ id INT PRIMARY KEY,
+ col BIGINT,
+ intcol BIGINT,
+ user_id INT,
+ id1 INT,
+ id2 INT,
+ id3 INT,
+ m INT,
+ bar INT,
+ a INT,
+ name VARCHAR(255),
+ col1 VARCHAR(255),
+ col2 VARCHAR(255),
+ costly VARCHAR(255),
+ predef1 VARCHAR(255),
+ predef2 VARCHAR(255),
+ textcol1 VARCHAR(255),
+ textcol2 VARCHAR(255),
+ someColumn VARCHAR(255),
+ foo VARCHAR(255)
);
CREATE TABLE user_metadata
@@ -23,6 +36,10 @@ CREATE TABLE music
(
user_id INT,
id INT,
+ col1 VARCHAR(255),
+ col2 VARCHAR(255),
+ genre VARCHAR(255),
+ componist VARCHAR(255),
PRIMARY KEY (user_id)
);
@@ -35,9 +52,9 @@ CREATE TABLE samecolvin
CREATE TABLE multicolvin
(
kid INT,
- column_a VARCHAR(255),
- column_b VARCHAR(255),
- column_c VARCHAR(255),
+ column_a INT,
+ column_b INT,
+ column_c INT,
PRIMARY KEY (kid)
);
@@ -97,4 +114,73 @@ CREATE TABLE authoritative
col1 VARCHAR(255),
col2 bigint,
PRIMARY KEY (user_id)
-) ENGINE=InnoDB;
\ No newline at end of file
+) ENGINE=InnoDB;
+
+CREATE TABLE colb_colc_map
+(
+ colb INT PRIMARY KEY,
+ colc INT,
+ keyspace_id VARCHAR(255)
+);
+
+CREATE TABLE seq
+(
+ id INT,
+ next_id BIGINT,
+ cache BIGINT,
+ PRIMARY KEY (id)
+) COMMENT 'vitess_sequence';
+
+CREATE TABLE user_extra
+(
+ id INT,
+ user_id INT,
+ extra_id INT,
+ col INT,
+ m2 INT,
+ PRIMARY KEY (id, extra_id)
+);
+
+CREATE TABLE name_user_map
+(
+ name VARCHAR(255),
+ keyspace_id VARCHAR(255)
+);
+
+CREATE TABLE name_user_vdx
+(
+ name VARCHAR(255),
+ keyspace_id VARCHAR(255)
+);
+
+CREATE TABLE costly_map
+(
+ costly VARCHAR(255),
+ keyspace_id VARCHAR(255)
+);
+
+CREATE TABLE unq_binary_idx
+(
+ id INT PRIMARY KEY,
+ col1 INT
+);
+
+CREATE TABLE sales
+(
+ oid INT PRIMARY KEY,
+ col1 VARCHAR(255)
+);
+
+CREATE TABLE sales_extra
+(
+ colx INT PRIMARY KEY,
+ cola VARCHAR(255),
+ colb VARCHAR(255),
+ start INT,
+ end INT
+);
+
+CREATE TABLE ref
+(
+ col INT PRIMARY KEY
+);
\ No newline at end of file
diff --git a/go/vt/vtgate/planbuilder/testdata/select_cases.json b/go/vt/vtgate/planbuilder/testdata/select_cases.json
index eac13216380..e18fa274d7e 100644
--- a/go/vt/vtgate/planbuilder/testdata/select_cases.json
+++ b/go/vt/vtgate/planbuilder/testdata/select_cases.json
@@ -4957,6 +4957,36 @@
]
}
},
+ {
+ "comment": "We are using last_insert_id with argument, so we need to fetch all results",
+ "query": "select last_insert_id(5) from user limit 12",
+ "plan": {
+ "QueryType": "SELECT",
+ "Original": "select last_insert_id(5) from user limit 12",
+ "Instructions": {
+ "OperatorType": "Limit",
+ "Count": "12",
+ "RequireCompleteInput": true,
+ "Inputs": [
+ {
+ "OperatorType": "Route",
+ "Variant": "Scatter",
+ "Keyspace": {
+ "Name": "user",
+ "Sharded": true
+ },
+ "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`"
+ }
+ ]
+ },
+ "TablesUsed": [
+ "user.user"
+ ]
+ }
+ },
{
"comment": "Unmergeable subquery with multiple levels of derived statements, using a multi value `IN` predicate",
"query": "SELECT music.id FROM music WHERE music.id IN (SELECT * FROM (SELECT * FROM (SELECT music.id FROM music WHERE music.user_id IN (5, 6) LIMIT 10) subquery_for_limit) subquery_for_limit)",
@@ -5599,6 +5629,7 @@
"Name": "user",
"Sharded": true
},
+ "FetchLastInsertID": true,
"FieldQuery": "select last_insert_id(id) from `user` where 1 != 1",
"Query": "select last_insert_id(id) from `user`",
"Table": "`user`"
diff --git a/go/vt/vtgate/planbuilder/testdata/vschemas/schema.json b/go/vt/vtgate/planbuilder/testdata/vschemas/schema.json
index a5de9d3697e..aaa11727510 100644
--- a/go/vt/vtgate/planbuilder/testdata/vschemas/schema.json
+++ b/go/vt/vtgate/planbuilder/testdata/vschemas/schema.json
@@ -214,6 +214,9 @@
"to": "keyspace_id",
"write_only": "true"
}
+ },
+ "binary": {
+ "type": "binary"
}
},
"tables": {
@@ -569,6 +572,62 @@
"name": "shard_index"
}
]
+ },
+ "unq_binary_idx": {
+ "column_vindexes" : [
+ {
+ "column" : "id",
+ "name": "binary"
+ }
+ ],
+ "columns" :[
+ {
+ "name": "col1",
+ "type": "INT16"
+ }
+ ]
+ },
+ "sales": {
+ "column_vindexes" : [
+ {
+ "column" : "oid",
+ "name" : "binary"
+ }
+ ],
+ "columns" : [
+ {
+ "name" : "col1",
+ "type" : "VARCHAR"
+ }
+ ]
+ },
+ "sales_extra" : {
+ "column_vindexes": [
+ {
+ "columns": [
+ "colx"
+ ],
+ "name": "shard_index"
+ }
+ ],
+ "columns" : [
+ {
+ "name" : "cola",
+ "type" : "VARCHAR"
+ },
+ {
+ "name" : "colb",
+ "type" : "VARCHAR"
+ },
+ {
+ "name" : "start",
+ "type" : "INT16"
+ },
+ {
+ "name" : "end",
+ "type" : "INT16"
+ }
+ ]
}
}
},
diff --git a/go/vt/vtgate/scatter_conn.go b/go/vt/vtgate/scatter_conn.go
index 6e2cf9ad8ba..edba48a9151 100644
--- a/go/vt/vtgate/scatter_conn.go
+++ b/go/vt/vtgate/scatter_conn.go
@@ -152,6 +152,7 @@ func (stc *ScatterConn) ExecuteMultiShard(
autocommit bool,
ignoreMaxMemoryRows bool,
resultsObserver econtext.ResultsObserver,
+ fetchLastInsertID bool,
) (qr *sqltypes.Result, errs []error) {
if len(rss) != len(queries) {
@@ -166,6 +167,10 @@ func (stc *ScatterConn) ExecuteMultiShard(
go stc.runLockQuery(ctx, session)
}
+ if session.Options != nil {
+ session.Options.FetchLastInsertId = fetchLastInsertID
+ }
+
allErrors := stc.multiGoTransaction(
ctx,
"Execute",
@@ -187,6 +192,10 @@ func (stc *ScatterConn) ExecuteMultiShard(
opts = session.Session.Options
}
+ if opts == nil && fetchLastInsertID {
+ opts = &querypb.ExecuteOptions{FetchLastInsertId: fetchLastInsertID}
+ }
+
if autocommit {
// As this is auto-commit, the transactionID is supposed to be zero.
if transactionID != int64(0) {
@@ -373,6 +382,7 @@ func (stc *ScatterConn) StreamExecuteMulti(
autocommit bool,
callback func(reply *sqltypes.Result) error,
resultsObserver econtext.ResultsObserver,
+ fetchLastInsertID bool,
) []error {
if session.InLockSession() && triggerLockHeartBeat(session) {
go stc.runLockQuery(ctx, session)
@@ -384,6 +394,11 @@ func (stc *ScatterConn) StreamExecuteMulti(
}
return callback(reply)
}
+
+ if session.Options != nil {
+ session.Options.FetchLastInsertId = fetchLastInsertID
+ }
+
allErrors := stc.multiGoTransaction(
ctx,
"StreamExecute",
@@ -404,6 +419,10 @@ func (stc *ScatterConn) StreamExecuteMulti(
opts = session.Session.Options
}
+ if opts == nil && fetchLastInsertID {
+ opts = &querypb.ExecuteOptions{FetchLastInsertId: fetchLastInsertID}
+ }
+
if autocommit {
// As this is auto-commit, the transactionID is supposed to be zero.
if transactionID != int64(0) {
diff --git a/go/vt/vtgate/scatter_conn_test.go b/go/vt/vtgate/scatter_conn_test.go
index ab8680ca5e6..e5c27c0de33 100644
--- a/go/vt/vtgate/scatter_conn_test.go
+++ b/go/vt/vtgate/scatter_conn_test.go
@@ -20,27 +20,23 @@ import (
"fmt"
"testing"
- "vitess.io/vitess/go/vt/log"
- econtext "vitess.io/vitess/go/vt/vtgate/executorcontext"
-
- "vitess.io/vitess/go/mysql/sqlerror"
- vtrpcpb "vitess.io/vitess/go/vt/proto/vtrpc"
-
+ "github.com/aws/smithy-go/ptr"
"github.com/stretchr/testify/assert"
-
- "vitess.io/vitess/go/vt/key"
-
- "vitess.io/vitess/go/test/utils"
-
"github.com/stretchr/testify/require"
+ "vitess.io/vitess/go/mysql/sqlerror"
"vitess.io/vitess/go/sqltypes"
+ "vitess.io/vitess/go/test/utils"
"vitess.io/vitess/go/vt/discovery"
+ "vitess.io/vitess/go/vt/key"
+ "vitess.io/vitess/go/vt/log"
querypb "vitess.io/vitess/go/vt/proto/query"
topodatapb "vitess.io/vitess/go/vt/proto/topodata"
vtgatepb "vitess.io/vitess/go/vt/proto/vtgate"
+ vtrpcpb "vitess.io/vitess/go/vt/proto/vtrpc"
"vitess.io/vitess/go/vt/srvtopo"
"vitess.io/vitess/go/vt/vterrors"
+ econtext "vitess.io/vitess/go/vt/vtgate/executorcontext"
)
// This file uses the sandbox_test framework.
@@ -101,7 +97,7 @@ func TestExecuteFailOnAutocommit(t *testing.T) {
},
Autocommit: false,
}
- _, errs := sc.ExecuteMultiShard(ctx, nil, rss, queries, econtext.NewSafeSession(session), true /*autocommit*/, false, nullResultsObserver{})
+ _, errs := sc.ExecuteMultiShard(ctx, nil, rss, queries, econtext.NewSafeSession(session), true /*autocommit*/, false, nullResultsObserver{}, false)
err := vterrors.Aggregate(errs)
require.Error(t, err)
require.Contains(t, err.Error(), "in autocommit mode, transactionID should be zero but was: 123")
@@ -109,6 +105,117 @@ func TestExecuteFailOnAutocommit(t *testing.T) {
utils.MustMatch(t, []*querypb.BoundQuery{queries[1]}, sbc1.Queries, "")
}
+func TestFetchLastInsertIDResets(t *testing.T) {
+ // This test verifies that the FetchLastInsertID flag is reset after a call to ExecuteMultiShard.
+ ks := "TestFetchLastInsertIDResets"
+ ctx := utils.LeakCheckContext(t)
+
+ createSandbox(ks)
+ hc := discovery.NewFakeHealthCheck(nil)
+ sc := newTestScatterConn(ctx, hc, newSandboxForCells(ctx, []string{"aa"}), "aa")
+ sbc0 := hc.AddTestTablet("aa", "0", 1, ks, "0", topodatapb.TabletType_PRIMARY, true, 1, nil)
+ sbc1 := hc.AddTestTablet("aa", "1", 1, ks, "1", topodatapb.TabletType_PRIMARY, true, 1, nil)
+
+ rss := []*srvtopo.ResolvedShard{{
+ Target: &querypb.Target{
+ Keyspace: ks,
+ Shard: "0",
+ TabletType: topodatapb.TabletType_PRIMARY,
+ },
+ Gateway: sbc0,
+ }, {
+ Target: &querypb.Target{
+ Keyspace: ks,
+ Shard: "1",
+ TabletType: topodatapb.TabletType_PRIMARY,
+ },
+ Gateway: sbc1,
+ }}
+ queries := []*querypb.BoundQuery{{
+ Sql: "query1",
+ BindVariables: map[string]*querypb.BindVariable{
+ "bv0": sqltypes.Int64BindVariable(0),
+ },
+ }, {
+ Sql: "query2",
+ BindVariables: map[string]*querypb.BindVariable{
+ "bv1": sqltypes.Int64BindVariable(1),
+ },
+ }}
+ tests := []struct {
+ name string
+ initialSessionOpts *querypb.ExecuteOptions
+ fetchLastInsertID bool
+ expectSessionNil bool
+ expectFetchLastID *bool // nil means checkLastOptionNil, otherwise checkLastOption(*bool)
+ }{
+ {
+ name: "no session options, fetchLastInsertID = false",
+ initialSessionOpts: nil,
+ fetchLastInsertID: false,
+ expectSessionNil: true,
+ expectFetchLastID: nil,
+ },
+ {
+ name: "no session options, fetchLastInsertID = true",
+ initialSessionOpts: nil,
+ fetchLastInsertID: true,
+ expectSessionNil: true,
+
+ expectFetchLastID: ptr.Bool(true),
+ },
+ {
+ name: "session options set, fetchLastInsertID = false",
+ initialSessionOpts: &querypb.ExecuteOptions{},
+ fetchLastInsertID: false,
+ expectSessionNil: false,
+ expectFetchLastID: ptr.Bool(false),
+ },
+ {
+ name: "session options set, fetchLastInsertID = true",
+ initialSessionOpts: &querypb.ExecuteOptions{},
+ fetchLastInsertID: true,
+ expectSessionNil: false,
+ expectFetchLastID: ptr.Bool(true),
+ },
+ }
+
+ for _, tt := range tests {
+ t.Run(tt.name, func(t *testing.T) {
+ session := econtext.NewSafeSession(nil)
+ session.Options = tt.initialSessionOpts
+
+ checkLastOption := func(expected bool) {
+ require.Equal(t, 1, len(sbc0.Options))
+ options := sbc0.Options[0]
+ assert.Equal(t, options.FetchLastInsertId, expected)
+ sbc0.Options = nil
+ }
+ checkLastOptionNil := func() {
+ require.Equal(t, 1, len(sbc0.Options))
+ assert.Nil(t, sbc0.Options[0])
+ sbc0.Options = nil
+ }
+
+ _, errs := sc.ExecuteMultiShard(ctx, nil, rss, queries, session, true /*autocommit*/, false, nullResultsObserver{}, tt.fetchLastInsertID)
+ require.NoError(t, vterrors.Aggregate(errs))
+
+ if tt.expectSessionNil {
+ assert.Nil(t, session.Options)
+ } else {
+ assert.NotNil(t, session.Options)
+ assert.Equal(t, tt.fetchLastInsertID, session.Options.FetchLastInsertId)
+ }
+
+ if tt.expectFetchLastID == nil {
+ checkLastOptionNil()
+ } else {
+ checkLastOption(*tt.expectFetchLastID)
+ }
+ })
+ }
+}
+
func TestExecutePanic(t *testing.T) {
ctx := utils.LeakCheckContext(t)
@@ -177,15 +284,10 @@ func TestExecutePanic(t *testing.T) {
logMessage = fmt.Sprintf(format, args...)
}
- defer func() {
- r := recover()
- require.NotNil(t, r, "The code did not panic")
- // assert we are seeing the stack trace
- require.Contains(t, logMessage, "(*ScatterConn).multiGoTransaction")
- }()
-
- _, _ = sc.ExecuteMultiShard(ctx, nil, rss, queries, econtext.NewSafeSession(session), true /*autocommit*/, false, nullResultsObserver{})
-
+ assert.Panics(t, func() {
+ _, _ = sc.ExecuteMultiShard(ctx, nil, rss, queries, econtext.NewSafeSession(session), true /*autocommit*/, false, nullResultsObserver{}, false)
+ })
+ require.Contains(t, logMessage, "(*ScatterConn).multiGoTransaction")
}
func TestReservedOnMultiReplica(t *testing.T) {
diff --git a/go/vt/vtgate/semantics/analyzer.go b/go/vt/vtgate/semantics/analyzer.go
index 0a9d2480d9b..988932f4414 100644
--- a/go/vt/vtgate/semantics/analyzer.go
+++ b/go/vt/vtgate/semantics/analyzer.go
@@ -151,7 +151,7 @@ func (a *analyzer) newSemTable(
ExpandedColumns: map[sqlparser.TableName][]*sqlparser.ColName{},
columns: map[*sqlparser.Union]sqlparser.SelectExprs{},
StatementIDs: a.scoper.statementIDs,
- QuerySignature: QuerySignature{},
+ QuerySignature: a.sig,
childForeignKeysInvolved: map[TableSet][]vindexes.ChildFKInfo{},
parentForeignKeysInvolved: map[TableSet][]vindexes.ParentFKInfo{},
childFkToUpdExprs: map[string]sqlparser.UpdateExprs{},
@@ -362,6 +362,10 @@ func (a *analyzer) analyze(statement sqlparser.Statement) error {
return a.err
}
+ if a.earlyTables.lastInsertIdWithArgument {
+ a.sig.LastInsertIDArg = true
+ }
+
if a.canShortCut(statement) {
return nil
}
diff --git a/go/vt/vtgate/semantics/analyzer_test.go b/go/vt/vtgate/semantics/analyzer_test.go
index 0c42456b0ab..de8fbdee0d7 100644
--- a/go/vt/vtgate/semantics/analyzer_test.go
+++ b/go/vt/vtgate/semantics/analyzer_test.go
@@ -625,6 +625,36 @@ func TestSubqueryOrderByBinding(t *testing.T) {
}
}
+func TestQuerySignatureLastInsertID(t *testing.T) {
+ queries := []struct {
+ query string
+ expected bool
+ }{{
+ query: "select 12",
+ expected: false,
+ }, {
+ query: "select last_insert_id()",
+ expected: false,
+ }, {
+ query: "select last_insert_id(123)",
+ expected: true,
+ }, {
+ query: "update user_extra set val = last_insert_id(123)",
+ expected: true,
+ }}
+
+ for _, tc := range queries {
+ t.Run(tc.query, func(t *testing.T) {
+ ast, err := sqlparser.NewTestParser().Parse(tc.query)
+ require.NoError(t, err)
+
+ st, err := AnalyzeStrict(ast, "dbName", fakeSchemaInfo())
+ require.NoError(t, err)
+ require.Equal(t, tc.expected, st.QuerySignature.LastInsertIDArg)
+ })
+ }
+}
+
func TestOrderByBindingTable(t *testing.T) {
tcases := []struct {
sql string
diff --git a/go/vt/vtgate/semantics/semantic_table.go b/go/vt/vtgate/semantics/semantic_table.go
index f9856a901a6..492259427c5 100644
--- a/go/vt/vtgate/semantics/semantic_table.go
+++ b/go/vt/vtgate/semantics/semantic_table.go
@@ -80,13 +80,14 @@ type (
// QuerySignature is used to identify shortcuts in the planning process
QuerySignature struct {
- Aggregation bool
- DML bool
- Distinct bool
- HashJoin bool
- SubQueries bool
- Union bool
- RecursiveCTE bool
+ Aggregation bool
+ DML bool
+ Distinct bool
+ HashJoin bool
+ SubQueries bool
+ Union bool
+ RecursiveCTE bool
+ LastInsertIDArg bool // LastInsertIDArg is true if the query has a LAST_INSERT_ID(x) with an argument
}
// MirrorInfo stores information used to produce mirror
@@ -1013,6 +1014,13 @@ func (st *SemTable) GetMirrorInfo() MirrorInfo {
return mirrorInfo(st.Tables)
}
+func (st *SemTable) ShouldFetchLastInsertID() bool {
+ if st == nil {
+ return false
+ }
+ return st.QuerySignature.LastInsertIDArg
+}
+
// mirrorInfo looks through all tables with mirror rules defined, and returns a
// MirrorInfo containing the lowest mirror percentage found across all rules.
//
diff --git a/go/vt/vtgate/semantics/table_collector.go b/go/vt/vtgate/semantics/table_collector.go
index 191d9c3b38e..45a50fd23a2 100644
--- a/go/vt/vtgate/semantics/table_collector.go
+++ b/go/vt/vtgate/semantics/table_collector.go
@@ -46,6 +46,10 @@ type (
// cte is a map of CTE definitions that are used in the query
cte map[string]*CTE
+
+ // lastInsertIdWithArgument is used to signal to later stages that we
+ // need to do special handling of the engine primitive
+ lastInsertIdWithArgument bool
}
)
@@ -59,18 +63,22 @@ func newEarlyTableCollector(si SchemaInformation, currentDb string) *earlyTableC
}
func (etc *earlyTableCollector) down(cursor *sqlparser.Cursor) bool {
- with, ok := cursor.Node().(*sqlparser.With)
- if !ok {
- return true
- }
- for _, cte := range with.CTEs {
- etc.cte[cte.ID.String()] = &CTE{
- Name: cte.ID.String(),
- Query: cte.Subquery,
- Columns: cte.Columns,
- Recursive: with.Recursive,
+ switch node := cursor.Node().(type) {
+ case *sqlparser.With:
+ for _, cte := range node.CTEs {
+ etc.cte[cte.ID.String()] = &CTE{
+ Name: cte.ID.String(),
+ Query: cte.Subquery,
+ Columns: cte.Columns,
+ Recursive: node.Recursive,
+ }
+ }
+ case *sqlparser.FuncExpr:
+ if node.Name.EqualString("last_insert_id") && len(node.Exprs) == 1 {
+ etc.lastInsertIdWithArgument = true
}
}
+
return true
}
diff --git a/go/vt/vtgate/tx_conn_test.go b/go/vt/vtgate/tx_conn_test.go
index 333094569c8..d96f0b8fccf 100644
--- a/go/vt/vtgate/tx_conn_test.go
+++ b/go/vt/vtgate/tx_conn_test.go
@@ -58,7 +58,7 @@ func TestTxConnBegin(t *testing.T) {
require.NoError(t, err)
wantSession := vtgatepb.Session{InTransaction: true}
utils.MustMatch(t, &wantSession, session, "Session")
- _, errors := sc.ExecuteMultiShard(ctx, nil, rss0, queries, safeSession, false, false, nullResultsObserver{})
+ _, errors := sc.ExecuteMultiShard(ctx, nil, rss0, queries, safeSession, false, false, nullResultsObserver{}, false)
require.Empty(t, errors)
// Begin again should cause a commit and a new begin.
@@ -78,7 +78,7 @@ func TestTxConnCommitFailure(t *testing.T) {
// Sequence the executes to ensure commit order
session := econtext.NewSafeSession(&vtgatepb.Session{InTransaction: true})
- sc.ExecuteMultiShard(ctx, nil, rssm[0], queries, session, false, false, nullResultsObserver{})
+ sc.ExecuteMultiShard(ctx, nil, rssm[0], queries, session, false, false, nullResultsObserver{}, false)
wantSession := vtgatepb.Session{
InTransaction: true,
ShardSessions: []*vtgatepb.Session_ShardSession{{
@@ -93,7 +93,7 @@ func TestTxConnCommitFailure(t *testing.T) {
}
utils.MustMatch(t, &wantSession, session.Session, "Session")
- sc.ExecuteMultiShard(ctx, nil, rssm[1], queries, session, false, false, nullResultsObserver{})
+ sc.ExecuteMultiShard(ctx, nil, rssm[1], queries, session, false, false, nullResultsObserver{}, false)
wantSession = vtgatepb.Session{
InTransaction: true,
ShardSessions: []*vtgatepb.Session_ShardSession{{
@@ -116,7 +116,7 @@ func TestTxConnCommitFailure(t *testing.T) {
}
utils.MustMatch(t, &wantSession, session.Session, "Session")
- sc.ExecuteMultiShard(ctx, nil, rssa, threeQueries, session, false, false, nullResultsObserver{})
+ sc.ExecuteMultiShard(ctx, nil, rssa, threeQueries, session, false, false, nullResultsObserver{}, false)
wantSession = vtgatepb.Session{
InTransaction: true,
ShardSessions: []*vtgatepb.Session_ShardSession{{
@@ -185,7 +185,7 @@ func TestTxConnCommitFailureAfterNonAtomicCommitMaxShards(t *testing.T) {
}
for i := 0; i < 18; i++ {
- sc.ExecuteMultiShard(ctx, nil, rssm[i], queries, session, false, false, nullResultsObserver{})
+ sc.ExecuteMultiShard(ctx, nil, rssm[i], queries, session, false, false, nullResultsObserver{}, false)
wantSession.ShardSessions = append(wantSession.ShardSessions, &vtgatepb.Session_ShardSession{
Target: &querypb.Target{
Keyspace: "TestTxConn",
@@ -239,7 +239,7 @@ func TestTxConnCommitFailureBeforeNonAtomicCommitMaxShards(t *testing.T) {
}
for i := 0; i < 17; i++ {
- sc.ExecuteMultiShard(ctx, nil, rssm[i], queries, session, false, false, nullResultsObserver{})
+ sc.ExecuteMultiShard(ctx, nil, rssm[i], queries, session, false, false, nullResultsObserver{}, false)
wantSession.ShardSessions = append(wantSession.ShardSessions, &vtgatepb.Session_ShardSession{
Target: &querypb.Target{
Keyspace: "TestTxConn",
@@ -285,7 +285,7 @@ func TestTxConnCommitSuccess(t *testing.T) {
// Sequence the executes to ensure commit order
session := econtext.NewSafeSession(&vtgatepb.Session{InTransaction: true})
- sc.ExecuteMultiShard(ctx, nil, rss0, queries, session, false, false, nullResultsObserver{})
+ sc.ExecuteMultiShard(ctx, nil, rss0, queries, session, false, false, nullResultsObserver{}, false)
wantSession := vtgatepb.Session{
InTransaction: true,
ShardSessions: []*vtgatepb.Session_ShardSession{{
@@ -299,7 +299,7 @@ func TestTxConnCommitSuccess(t *testing.T) {
}},
}
utils.MustMatch(t, &wantSession, session.Session, "Session")
- sc.ExecuteMultiShard(ctx, nil, rss01, twoQueries, session, false, false, nullResultsObserver{})
+ sc.ExecuteMultiShard(ctx, nil, rss01, twoQueries, session, false, false, nullResultsObserver{}, false)
wantSession = vtgatepb.Session{
InTransaction: true,
ShardSessions: []*vtgatepb.Session_ShardSession{{
@@ -338,7 +338,7 @@ func TestTxConnReservedCommitSuccess(t *testing.T) {
// Sequence the executes to ensure commit order
session := econtext.NewSafeSession(&vtgatepb.Session{InTransaction: true, InReservedConn: true})
- sc.ExecuteMultiShard(ctx, nil, rss0, queries, session, false, false, nullResultsObserver{})
+ sc.ExecuteMultiShard(ctx, nil, rss0, queries, session, false, false, nullResultsObserver{}, false)
wantSession := vtgatepb.Session{
InTransaction: true,
InReservedConn: true,
@@ -354,7 +354,7 @@ func TestTxConnReservedCommitSuccess(t *testing.T) {
}},
}
utils.MustMatch(t, &wantSession, session.Session, "Session")
- sc.ExecuteMultiShard(ctx, nil, rss01, twoQueries, session, false, false, nullResultsObserver{})
+ sc.ExecuteMultiShard(ctx, nil, rss01, twoQueries, session, false, false, nullResultsObserver{}, false)
wantSession = vtgatepb.Session{
InTransaction: true,
InReservedConn: true,
@@ -425,9 +425,9 @@ func TestTxConnReservedOn2ShardTxOn1ShardAndCommit(t *testing.T) {
session := econtext.NewSafeSession(&vtgatepb.Session{InReservedConn: true})
// this will create reserved connections against all tablets
- _, errs := sc.ExecuteMultiShard(ctx, nil, rss1, queries, session, false, false, nullResultsObserver{})
+ _, errs := sc.ExecuteMultiShard(ctx, nil, rss1, queries, session, false, false, nullResultsObserver{}, false)
require.Empty(t, errs)
- _, errs = sc.ExecuteMultiShard(ctx, nil, rss0, queries, session, false, false, nullResultsObserver{})
+ _, errs = sc.ExecuteMultiShard(ctx, nil, rss0, queries, session, false, false, nullResultsObserver{}, false)
require.Empty(t, errs)
wantSession := vtgatepb.Session{
@@ -455,7 +455,7 @@ func TestTxConnReservedOn2ShardTxOn1ShardAndCommit(t *testing.T) {
session.Session.InTransaction = true
// start a transaction against rss0
- sc.ExecuteMultiShard(ctx, nil, rss0, queries, session, false, false, nullResultsObserver{})
+ sc.ExecuteMultiShard(ctx, nil, rss0, queries, session, false, false, nullResultsObserver{}, false)
wantSession = vtgatepb.Session{
InTransaction: true,
InReservedConn: true,
@@ -520,9 +520,9 @@ func TestTxConnReservedOn2ShardTxOn1ShardAndRollback(t *testing.T) {
session := econtext.NewSafeSession(&vtgatepb.Session{InReservedConn: true})
// this will create reserved connections against all tablets
- _, errs := sc.ExecuteMultiShard(ctx, nil, rss1, queries, session, false, false, nullResultsObserver{})
+ _, errs := sc.ExecuteMultiShard(ctx, nil, rss1, queries, session, false, false, nullResultsObserver{}, false)
require.Empty(t, errs)
- _, errs = sc.ExecuteMultiShard(ctx, nil, rss0, queries, session, false, false, nullResultsObserver{})
+ _, errs = sc.ExecuteMultiShard(ctx, nil, rss0, queries, session, false, false, nullResultsObserver{}, false)
require.Empty(t, errs)
wantSession := vtgatepb.Session{
@@ -550,7 +550,7 @@ func TestTxConnReservedOn2ShardTxOn1ShardAndRollback(t *testing.T) {
session.Session.InTransaction = true
// start a transaction against rss0
- sc.ExecuteMultiShard(ctx, nil, rss0, queries, session, false, false, nullResultsObserver{})
+ sc.ExecuteMultiShard(ctx, nil, rss0, queries, session, false, false, nullResultsObserver{}, false)
wantSession = vtgatepb.Session{
InTransaction: true,
InReservedConn: true,
@@ -614,13 +614,13 @@ func TestTxConnCommitOrderFailure1(t *testing.T) {
// Sequence the executes to ensure commit order
session := econtext.NewSafeSession(&vtgatepb.Session{InTransaction: true})
- sc.ExecuteMultiShard(ctx, nil, rss0, queries, session, false, false, nullResultsObserver{})
+ sc.ExecuteMultiShard(ctx, nil, rss0, queries, session, false, false, nullResultsObserver{}, false)
session.SetCommitOrder(vtgatepb.CommitOrder_PRE)
- sc.ExecuteMultiShard(ctx, nil, rss0, queries, session, false, false, nullResultsObserver{})
+ sc.ExecuteMultiShard(ctx, nil, rss0, queries, session, false, false, nullResultsObserver{}, false)
session.SetCommitOrder(vtgatepb.CommitOrder_POST)
- sc.ExecuteMultiShard(ctx, nil, rss1, queries, session, false, false, nullResultsObserver{})
+ sc.ExecuteMultiShard(ctx, nil, rss1, queries, session, false, false, nullResultsObserver{}, false)
sbc0.MustFailCodes[vtrpcpb.Code_INVALID_ARGUMENT] = 1
err := sc.txConn.Commit(ctx, session)
@@ -649,13 +649,13 @@ func TestTxConnCommitOrderFailure2(t *testing.T) {
// Sequence the executes to ensure commit order
session := econtext.NewSafeSession(&vtgatepb.Session{InTransaction: true})
- sc.ExecuteMultiShard(context.Background(), nil, rss1, queries, session, false, false, nullResultsObserver{})
+ sc.ExecuteMultiShard(context.Background(), nil, rss1, queries, session, false, false, nullResultsObserver{}, false)
session.SetCommitOrder(vtgatepb.CommitOrder_PRE)
- sc.ExecuteMultiShard(context.Background(), nil, rss0, queries, session, false, false, nullResultsObserver{})
+ sc.ExecuteMultiShard(context.Background(), nil, rss0, queries, session, false, false, nullResultsObserver{}, false)
session.SetCommitOrder(vtgatepb.CommitOrder_POST)
- sc.ExecuteMultiShard(context.Background(), nil, rss1, queries, session, false, false, nullResultsObserver{})
+ sc.ExecuteMultiShard(context.Background(), nil, rss1, queries, session, false, false, nullResultsObserver{}, false)
sbc1.MustFailCodes[vtrpcpb.Code_INVALID_ARGUMENT] = 1
err := sc.txConn.Commit(ctx, session)
@@ -683,13 +683,13 @@ func TestTxConnCommitOrderFailure3(t *testing.T) {
// Sequence the executes to ensure commit order
session := econtext.NewSafeSession(&vtgatepb.Session{InTransaction: true})
- sc.ExecuteMultiShard(ctx, nil, rss0, queries, session, false, false, nullResultsObserver{})
+ sc.ExecuteMultiShard(ctx, nil, rss0, queries, session, false, false, nullResultsObserver{}, false)
session.SetCommitOrder(vtgatepb.CommitOrder_PRE)
- sc.ExecuteMultiShard(ctx, nil, rss0, queries, session, false, false, nullResultsObserver{})
+ sc.ExecuteMultiShard(ctx, nil, rss0, queries, session, false, false, nullResultsObserver{}, false)
session.SetCommitOrder(vtgatepb.CommitOrder_POST)
- sc.ExecuteMultiShard(ctx, nil, rss1, queries, session, false, false, nullResultsObserver{})
+ sc.ExecuteMultiShard(ctx, nil, rss1, queries, session, false, false, nullResultsObserver{}, false)
sbc1.MustFailCodes[vtrpcpb.Code_INVALID_ARGUMENT] = 1
require.NoError(t,
@@ -725,7 +725,7 @@ func TestTxConnCommitOrderSuccess(t *testing.T) {
// Sequence the executes to ensure commit order
session := econtext.NewSafeSession(&vtgatepb.Session{InTransaction: true})
- sc.ExecuteMultiShard(ctx, nil, rss0, queries, session, false, false, nullResultsObserver{})
+ sc.ExecuteMultiShard(ctx, nil, rss0, queries, session, false, false, nullResultsObserver{}, false)
wantSession := vtgatepb.Session{
InTransaction: true,
ShardSessions: []*vtgatepb.Session_ShardSession{{
@@ -741,7 +741,7 @@ func TestTxConnCommitOrderSuccess(t *testing.T) {
utils.MustMatch(t, &wantSession, session.Session, "Session")
session.SetCommitOrder(vtgatepb.CommitOrder_PRE)
- sc.ExecuteMultiShard(ctx, nil, rss0, queries, session, false, false, nullResultsObserver{})
+ sc.ExecuteMultiShard(ctx, nil, rss0, queries, session, false, false, nullResultsObserver{}, false)
wantSession = vtgatepb.Session{
InTransaction: true,
PreSessions: []*vtgatepb.Session_ShardSession{{
@@ -766,7 +766,7 @@ func TestTxConnCommitOrderSuccess(t *testing.T) {
utils.MustMatch(t, &wantSession, session.Session, "Session")
session.SetCommitOrder(vtgatepb.CommitOrder_POST)
- sc.ExecuteMultiShard(ctx, nil, rss1, queries, session, false, false, nullResultsObserver{})
+ sc.ExecuteMultiShard(ctx, nil, rss1, queries, session, false, false, nullResultsObserver{}, false)
wantSession = vtgatepb.Session{
InTransaction: true,
PreSessions: []*vtgatepb.Session_ShardSession{{
@@ -800,7 +800,7 @@ func TestTxConnCommitOrderSuccess(t *testing.T) {
utils.MustMatch(t, &wantSession, session.Session, "Session")
// Ensure nothing changes if we reuse a transaction.
- sc.ExecuteMultiShard(ctx, nil, rss1, queries, session, false, false, nullResultsObserver{})
+ sc.ExecuteMultiShard(ctx, nil, rss1, queries, session, false, false, nullResultsObserver{}, false)
utils.MustMatch(t, &wantSession, session.Session, "Session")
require.NoError(t,
@@ -823,7 +823,7 @@ func TestTxConnReservedCommitOrderSuccess(t *testing.T) {
// Sequence the executes to ensure commit order
session := econtext.NewSafeSession(&vtgatepb.Session{InTransaction: true, InReservedConn: true})
- sc.ExecuteMultiShard(ctx, nil, rss0, queries, session, false, false, nullResultsObserver{})
+ sc.ExecuteMultiShard(ctx, nil, rss0, queries, session, false, false, nullResultsObserver{}, false)
wantSession := vtgatepb.Session{
InTransaction: true,
InReservedConn: true,
@@ -841,7 +841,7 @@ func TestTxConnReservedCommitOrderSuccess(t *testing.T) {
utils.MustMatch(t, &wantSession, session.Session, "Session")
session.SetCommitOrder(vtgatepb.CommitOrder_PRE)
- sc.ExecuteMultiShard(ctx, nil, rss0, queries, session, false, false, nullResultsObserver{})
+ sc.ExecuteMultiShard(ctx, nil, rss0, queries, session, false, false, nullResultsObserver{}, false)
wantSession = vtgatepb.Session{
InTransaction: true,
InReservedConn: true,
@@ -869,7 +869,7 @@ func TestTxConnReservedCommitOrderSuccess(t *testing.T) {
utils.MustMatch(t, &wantSession, session.Session, "Session")
session.SetCommitOrder(vtgatepb.CommitOrder_POST)
- sc.ExecuteMultiShard(ctx, nil, rss1, queries, session, false, false, nullResultsObserver{})
+ sc.ExecuteMultiShard(ctx, nil, rss1, queries, session, false, false, nullResultsObserver{}, false)
wantSession = vtgatepb.Session{
InTransaction: true,
InReservedConn: true,
@@ -907,7 +907,7 @@ func TestTxConnReservedCommitOrderSuccess(t *testing.T) {
utils.MustMatch(t, &wantSession, session.Session, "Session")
// Ensure nothing changes if we reuse a transaction.
- sc.ExecuteMultiShard(ctx, nil, rss1, queries, session, false, false, nullResultsObserver{})
+ sc.ExecuteMultiShard(ctx, nil, rss1, queries, session, false, false, nullResultsObserver{}, false)
utils.MustMatch(t, &wantSession, session.Session, "Session")
require.NoError(t,
@@ -960,8 +960,8 @@ func TestTxConnCommit2PC(t *testing.T) {
sc, sbc0, sbc1, rss0, _, rss01 := newTestTxConnEnv(t, ctx, "TestTxConnCommit2PC")
session := econtext.NewSafeSession(&vtgatepb.Session{InTransaction: true})
- sc.ExecuteMultiShard(ctx, nil, rss0, queries, session, false, false, nullResultsObserver{})
- sc.ExecuteMultiShard(ctx, nil, rss01, twoQueries, session, false, false, nullResultsObserver{})
+ sc.ExecuteMultiShard(ctx, nil, rss0, queries, session, false, false, nullResultsObserver{}, false)
+ sc.ExecuteMultiShard(ctx, nil, rss01, twoQueries, session, false, false, nullResultsObserver{}, false)
session.TransactionMode = vtgatepb.TransactionMode_TWOPC
require.NoError(t,
sc.txConn.Commit(ctx, session))
@@ -977,7 +977,7 @@ func TestTxConnCommit2PCOneParticipant(t *testing.T) {
sc, sbc0, _, rss0, _, _ := newTestTxConnEnv(t, ctx, "TestTxConnCommit2PCOneParticipant")
session := econtext.NewSafeSession(&vtgatepb.Session{InTransaction: true})
- sc.ExecuteMultiShard(ctx, nil, rss0, queries, session, false, false, nullResultsObserver{})
+ sc.ExecuteMultiShard(ctx, nil, rss0, queries, session, false, false, nullResultsObserver{}, false)
session.TransactionMode = vtgatepb.TransactionMode_TWOPC
require.NoError(t,
sc.txConn.Commit(ctx, session))
@@ -990,8 +990,8 @@ func TestTxConnCommit2PCCreateTransactionFail(t *testing.T) {
sc, sbc0, sbc1, rss0, rss1, _ := newTestTxConnEnv(t, ctx, "TestTxConnCommit2PCCreateTransactionFail")
session := econtext.NewSafeSession(&vtgatepb.Session{InTransaction: true})
- sc.ExecuteMultiShard(ctx, nil, rss0, queries, session, false, false, nullResultsObserver{})
- sc.ExecuteMultiShard(ctx, nil, rss1, queries, session, false, false, nullResultsObserver{})
+ sc.ExecuteMultiShard(ctx, nil, rss0, queries, session, false, false, nullResultsObserver{}, false)
+ sc.ExecuteMultiShard(ctx, nil, rss1, queries, session, false, false, nullResultsObserver{}, false)
sbc0.MustFailCreateTransaction = 1
session.TransactionMode = vtgatepb.TransactionMode_TWOPC
@@ -1012,8 +1012,8 @@ func TestTxConnCommit2PCPrepareFail(t *testing.T) {
sc, sbc0, sbc1, rss0, _, rss01 := newTestTxConnEnv(t, ctx, "TestTxConnCommit2PCPrepareFail")
session := econtext.NewSafeSession(&vtgatepb.Session{InTransaction: true})
- sc.ExecuteMultiShard(ctx, nil, rss0, queries, session, false, false, nullResultsObserver{})
- sc.ExecuteMultiShard(ctx, nil, rss01, twoQueries, session, false, false, nullResultsObserver{})
+ sc.ExecuteMultiShard(ctx, nil, rss0, queries, session, false, false, nullResultsObserver{}, false)
+ sc.ExecuteMultiShard(ctx, nil, rss01, twoQueries, session, false, false, nullResultsObserver{}, false)
sbc1.MustFailPrepare = 1
session.TransactionMode = vtgatepb.TransactionMode_TWOPC
@@ -1038,8 +1038,8 @@ func TestTxConnCommit2PCStartCommitFail(t *testing.T) {
sc, sbc0, sbc1, rss0, _, rss01 := newTestTxConnEnv(t, ctx, "TestTxConnCommit2PCStartCommitFail")
session := econtext.NewSafeSession(&vtgatepb.Session{InTransaction: true})
- sc.ExecuteMultiShard(ctx, nil, rss0, queries, session, false, false, nullResultsObserver{})
- sc.ExecuteMultiShard(ctx, nil, rss01, twoQueries, session, false, false, nullResultsObserver{})
+ sc.ExecuteMultiShard(ctx, nil, rss0, queries, session, false, false, nullResultsObserver{}, false)
+ sc.ExecuteMultiShard(ctx, nil, rss01, twoQueries, session, false, false, nullResultsObserver{}, false)
sbc0.MustFailStartCommit = 1
session.TransactionMode = vtgatepb.TransactionMode_TWOPC
@@ -1057,8 +1057,8 @@ func TestTxConnCommit2PCStartCommitFail(t *testing.T) {
sbc1.ResetCounter()
session = econtext.NewSafeSession(&vtgatepb.Session{InTransaction: true})
- sc.ExecuteMultiShard(ctx, nil, rss0, queries, session, false, false, nullResultsObserver{})
- sc.ExecuteMultiShard(ctx, nil, rss01, twoQueries, session, false, false, nullResultsObserver{})
+ sc.ExecuteMultiShard(ctx, nil, rss0, queries, session, false, false, nullResultsObserver{}, false)
+ sc.ExecuteMultiShard(ctx, nil, rss01, twoQueries, session, false, false, nullResultsObserver{}, false)
// Here the StartCommit failure is in uncertain state so rollback is not called and neither conclude.
sbc0.MustFailStartCommitUncertain = 1
@@ -1080,8 +1080,8 @@ func TestTxConnCommit2PCCommitPreparedFail(t *testing.T) {
sc, sbc0, sbc1, rss0, _, rss01 := newTestTxConnEnv(t, ctx, "TestTxConnCommit2PCCommitPreparedFail")
session := econtext.NewSafeSession(&vtgatepb.Session{InTransaction: true})
- sc.ExecuteMultiShard(ctx, nil, rss0, queries, session, false, false, nullResultsObserver{})
- sc.ExecuteMultiShard(ctx, nil, rss01, twoQueries, session, false, false, nullResultsObserver{})
+ sc.ExecuteMultiShard(ctx, nil, rss0, queries, session, false, false, nullResultsObserver{}, false)
+ sc.ExecuteMultiShard(ctx, nil, rss01, twoQueries, session, false, false, nullResultsObserver{}, false)
sbc1.MustFailCommitPrepared = 1
session.TransactionMode = vtgatepb.TransactionMode_TWOPC
@@ -1100,8 +1100,8 @@ func TestTxConnCommit2PCConcludeTransactionFail(t *testing.T) {
sc, sbc0, sbc1, rss0, _, rss01 := newTestTxConnEnv(t, ctx, "TestTxConnCommit2PCConcludeTransactionFail")
session := econtext.NewSafeSession(&vtgatepb.Session{InTransaction: true})
- sc.ExecuteMultiShard(ctx, nil, rss0, queries, session, false, false, nullResultsObserver{})
- sc.ExecuteMultiShard(ctx, nil, rss01, twoQueries, session, false, false, nullResultsObserver{})
+ sc.ExecuteMultiShard(ctx, nil, rss0, queries, session, false, false, nullResultsObserver{}, false)
+ sc.ExecuteMultiShard(ctx, nil, rss01, twoQueries, session, false, false, nullResultsObserver{}, false)
sbc0.MustFailConcludeTransaction = 1
session.TransactionMode = vtgatepb.TransactionMode_TWOPC
@@ -1120,8 +1120,8 @@ func TestTxConnRollback(t *testing.T) {
sc, sbc0, sbc1, rss0, _, rss01 := newTestTxConnEnv(t, ctx, "TxConnRollback")
session := econtext.NewSafeSession(&vtgatepb.Session{InTransaction: true})
- sc.ExecuteMultiShard(ctx, nil, rss0, queries, session, false, false, nullResultsObserver{})
- sc.ExecuteMultiShard(ctx, nil, rss01, twoQueries, session, false, false, nullResultsObserver{})
+ sc.ExecuteMultiShard(ctx, nil, rss0, queries, session, false, false, nullResultsObserver{}, false)
+ sc.ExecuteMultiShard(ctx, nil, rss01, twoQueries, session, false, false, nullResultsObserver{}, false)
require.NoError(t,
sc.txConn.Rollback(ctx, session))
wantSession := vtgatepb.Session{}
@@ -1136,8 +1136,8 @@ func TestTxConnReservedRollback(t *testing.T) {
sc, sbc0, sbc1, rss0, _, rss01 := newTestTxConnEnv(t, ctx, "TxConnReservedRollback")
session := econtext.NewSafeSession(&vtgatepb.Session{InTransaction: true, InReservedConn: true})
- sc.ExecuteMultiShard(ctx, nil, rss0, queries, session, false, false, nullResultsObserver{})
- sc.ExecuteMultiShard(ctx, nil, rss01, twoQueries, session, false, false, nullResultsObserver{})
+ sc.ExecuteMultiShard(ctx, nil, rss0, queries, session, false, false, nullResultsObserver{}, false)
+ sc.ExecuteMultiShard(ctx, nil, rss01, twoQueries, session, false, false, nullResultsObserver{}, false)
require.NoError(t,
sc.txConn.Rollback(ctx, session))
wantSession := vtgatepb.Session{
@@ -1173,8 +1173,8 @@ func TestTxConnReservedRollbackFailure(t *testing.T) {
sc, sbc0, sbc1, rss0, rss1, rss01 := newTestTxConnEnv(t, ctx, "TxConnReservedRollback")
session := econtext.NewSafeSession(&vtgatepb.Session{InTransaction: true, InReservedConn: true})
- sc.ExecuteMultiShard(ctx, nil, rss0, queries, session, false, false, nullResultsObserver{})
- sc.ExecuteMultiShard(ctx, nil, rss01, twoQueries, session, false, false, nullResultsObserver{})
+ sc.ExecuteMultiShard(ctx, nil, rss0, queries, session, false, false, nullResultsObserver{}, false)
+ sc.ExecuteMultiShard(ctx, nil, rss01, twoQueries, session, false, false, nullResultsObserver{}, false)
sbc1.MustFailCodes[vtrpcpb.Code_INVALID_ARGUMENT] = 1
assert.Error(t,
diff --git a/go/vt/vtgate/vindexes/binary.go b/go/vt/vtgate/vindexes/binary.go
index b78451ca1fb..96a72b2c3f4 100644
--- a/go/vt/vtgate/vindexes/binary.go
+++ b/go/vt/vtgate/vindexes/binary.go
@@ -30,6 +30,7 @@ var (
_ Reversible = (*Binary)(nil)
_ Hashing = (*Binary)(nil)
_ ParamValidating = (*Binary)(nil)
+ _ Sequential = (*Binary)(nil)
)
// Binary is a vindex that converts binary bits to a keyspace id.
@@ -108,6 +109,20 @@ func (*Binary) ReverseMap(_ VCursor, ksids [][]byte) ([]sqltypes.Value, error) {
return reverseIds, nil
}
+// RangeMap can map ids to key.Destination objects.
+func (vind *Binary) RangeMap(ctx context.Context, vcursor VCursor, startId sqltypes.Value, endId sqltypes.Value) ([]key.Destination, error) {
+ startKsId, err := vind.Hash(startId)
+ if err != nil {
+ return nil, err
+ }
+ endKsId, err := vind.Hash(endId)
+ if err != nil {
+ return nil, err
+ }
+ out := []key.Destination{&key.DestinationKeyRange{KeyRange: key.NewKeyRange(startKsId, endKsId)}}
+ return out, nil
+}
+
// UnknownParams implements the ParamValidating interface.
func (vind *Binary) UnknownParams() []string {
return vind.unknownParams
diff --git a/go/vt/vtgate/vindexes/binary_test.go b/go/vt/vtgate/vindexes/binary_test.go
index 27ae6ceca11..a6556ec958a 100644
--- a/go/vt/vtgate/vindexes/binary_test.go
+++ b/go/vt/vtgate/vindexes/binary_test.go
@@ -24,6 +24,7 @@ import (
"reflect"
"testing"
+ "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"vitess.io/vitess/go/sqltypes"
@@ -145,3 +146,18 @@ func TestBinaryReverseMap(t *testing.T) {
t.Errorf("ReverseMap(): %v, want %s", err, wantErr)
}
}
+
+// TestBinaryRangeMap takes start and env values,
+// and checks against a destination keyrange.
+func TestBinaryRangeMap(t *testing.T) {
+
+ startInterval := "0x01"
+ endInterval := "0x10"
+
+ got, err := binOnlyVindex.(Sequential).RangeMap(context.Background(), nil, sqltypes.NewHexNum([]byte(startInterval)),
+ sqltypes.NewHexNum([]byte(endInterval)))
+ require.NoError(t, err)
+ want := "DestinationKeyRange(01-10)"
+ assert.Equal(t, want, got[0].String())
+
+}
diff --git a/go/vt/vtgate/vindexes/numeric.go b/go/vt/vtgate/vindexes/numeric.go
index 091807ec2cc..b40df13a997 100644
--- a/go/vt/vtgate/vindexes/numeric.go
+++ b/go/vt/vtgate/vindexes/numeric.go
@@ -31,6 +31,7 @@ var (
_ Reversible = (*Numeric)(nil)
_ Hashing = (*Numeric)(nil)
_ ParamValidating = (*Numeric)(nil)
+ _ Sequential = (*Numeric)(nil)
)
// Numeric defines a bit-pattern mapping of a uint64 to the KeyspaceId.
@@ -108,6 +109,20 @@ func (*Numeric) ReverseMap(_ VCursor, ksids [][]byte) ([]sqltypes.Value, error)
return reverseIds, nil
}
+// RangeMap implements Between.
+func (vind *Numeric) RangeMap(ctx context.Context, vcursor VCursor, startId sqltypes.Value, endId sqltypes.Value) ([]key.Destination, error) {
+ startKsId, err := vind.Hash(startId)
+ if err != nil {
+ return nil, err
+ }
+ endKsId, err := vind.Hash(endId)
+ if err != nil {
+ return nil, err
+ }
+ out := []key.Destination{&key.DestinationKeyRange{KeyRange: key.NewKeyRange(startKsId, endKsId)}}
+ return out, nil
+}
+
// UnknownParams implements the ParamValidating interface.
func (vind *Numeric) UnknownParams() []string {
return vind.unknownParams
diff --git a/go/vt/vtgate/vindexes/vindex.go b/go/vt/vtgate/vindexes/vindex.go
index e3d5a6d7e4d..947877108e0 100644
--- a/go/vt/vtgate/vindexes/vindex.go
+++ b/go/vt/vtgate/vindexes/vindex.go
@@ -130,6 +130,13 @@ type (
ReverseMap(vcursor VCursor, ks [][]byte) ([]sqltypes.Value, error)
}
+ // A Sequential vindex is an optional interface one that maps to a keyspace range
+ // instead of a single keyspace id. It's being used to reduce the fan out for
+ // 'BETWEEN' expressions.
+ Sequential interface {
+ RangeMap(ctx context.Context, vcursor VCursor, startId sqltypes.Value, endId sqltypes.Value) ([]key.Destination, error)
+ }
+
// A Prefixable vindex is one that maps the prefix of a id to a keyspace range
// instead of a single keyspace id. It's being used to reduced the fan out for
// 'LIKE' expressions.
diff --git a/go/vt/vttablet/endtoend/misc_test.go b/go/vt/vttablet/endtoend/misc_test.go
index 68f6f4b1af6..8d5630a5dd8 100644
--- a/go/vt/vttablet/endtoend/misc_test.go
+++ b/go/vt/vttablet/endtoend/misc_test.go
@@ -49,10 +49,7 @@ import (
func TestSimpleRead(t *testing.T) {
vstart := framework.DebugVars()
_, err := framework.NewClient().Execute("select * from vitess_test where intval=1", nil)
- if err != nil {
- t.Error(err)
- return
- }
+ require.NoError(t, err)
vend := framework.DebugVars()
compareIntDiff(t, vend, "Queries/TotalCount", vstart, 1)
compareIntDiff(t, vend, "Queries/Histograms/Select/Count", vstart, 1)
@@ -69,15 +66,9 @@ func TestBinary(t *testing.T) {
"(4, null, null, '\\0\\'\\\"\\b\\n\\r\\t\\Z\\\\\x00\x0f\xf0\xff')",
nil,
)
- if err != nil {
- t.Error(err)
- return
- }
+ require.NoError(t, err)
qr, err := client.Execute("select binval from vitess_test where intval=4", nil)
- if err != nil {
- t.Error(err)
- return
- }
+ require.NoError(t, err)
want := sqltypes.Result{
Fields: []*querypb.Field{
{
@@ -106,18 +97,10 @@ func TestBinary(t *testing.T) {
"insert into vitess_test values(5, null, null, :bindata)",
map[string]*querypb.BindVariable{"bindata": sqltypes.StringBindVariable(binaryData)},
)
- if err != nil {
- t.Error(err)
- return
- }
+ require.NoError(t, err)
qr, err = client.Execute("select binval from vitess_test where intval=5", nil)
- if err != nil {
- t.Error(err)
- return
- }
- if !qr.Equal(&want) {
- t.Errorf("Execute: \n%#v, want \n%#v", prettyPrint(*qr), prettyPrint(want))
- }
+ require.NoError(t, err)
+ assert.Truef(t, qr.Equal(&want), "Execute: \n%#v, want \n%#v", prettyPrint(*qr), prettyPrint(want))
}
func TestNocacheListArgs(t *testing.T) {
@@ -130,10 +113,7 @@ func TestNocacheListArgs(t *testing.T) {
"list": sqltypes.TestBindVariable([]any{2, 3, 4}),
},
)
- if err != nil {
- t.Error(err)
- return
- }
+ require.NoError(t, err)
assert.Equal(t, 2, len(qr.Rows))
qr, err = client.Execute(
@@ -142,10 +122,7 @@ func TestNocacheListArgs(t *testing.T) {
"list": sqltypes.TestBindVariable([]any{3, 4}),
},
)
- if err != nil {
- t.Error(err)
- return
- }
+ require.NoError(t, err)
assert.Equal(t, 1, len(qr.Rows))
qr, err = client.Execute(
@@ -154,10 +131,7 @@ func TestNocacheListArgs(t *testing.T) {
"list": sqltypes.TestBindVariable([]any{3}),
},
)
- if err != nil {
- t.Error(err)
- return
- }
+ require.NoError(t, err)
assert.Equal(t, 1, len(qr.Rows))
// Error case
@@ -167,11 +141,7 @@ func TestNocacheListArgs(t *testing.T) {
"list": sqltypes.TestBindVariable([]any{}),
},
)
- want := "empty list supplied for list (CallerID: dev)"
- if err == nil || err.Error() != want {
- t.Errorf("Error: %v, want %s", err, want)
- return
- }
+ assert.EqualError(t, err, "empty list supplied for list (CallerID: dev)")
}
func TestIntegrityError(t *testing.T) {
@@ -179,9 +149,7 @@ func TestIntegrityError(t *testing.T) {
client := framework.NewClient()
_, err := client.Execute("insert into vitess_test values(1, null, null, null)", nil)
want := "Duplicate entry '1'"
- if err == nil || !strings.HasPrefix(err.Error(), want) {
- t.Errorf("Error: %v, want prefix %s", err, want)
- }
+ assert.ErrorContains(t, err, want)
compareIntDiff(t, framework.DebugVars(), "Errors/ALREADY_EXISTS", vstart, 1)
}
@@ -197,10 +165,7 @@ func TestTrailingComment(t *testing.T) {
"select * from vitess_test where intval=:ival /* comment1 */ /* comment2 */",
} {
_, err := client.Execute(query, bindVars)
- if err != nil {
- t.Error(err)
- return
- }
+ require.NoError(t, err)
v2 := framework.Server.QueryPlanCacheLen()
if v2 != v1+1 {
t.Errorf("QueryEnginePlanCacheLength(%s): %d, want %d", query, v2, v1+1)
@@ -211,17 +176,11 @@ func TestTrailingComment(t *testing.T) {
func TestSchemaReload(t *testing.T) {
ctx := context.Background()
conn, err := mysql.Connect(ctx, &connParams)
- if err != nil {
- t.Error(err)
- return
- }
+ require.NoError(t, err)
defer conn.Close()
_, err = conn.ExecuteFetch("create table vitess_temp(intval int)", 10, false)
- if err != nil {
- t.Error(err)
- return
- }
+ require.NoError(t, err)
defer conn.ExecuteFetch("drop table vitess_temp", 10, false)
framework.Server.ReloadSchema(context.Background())
@@ -246,10 +205,7 @@ func TestSchemaReload(t *testing.T) {
func TestSidecarTables(t *testing.T) {
ctx := context.Background()
conn, err := mysql.Connect(ctx, &connParams)
- if err != nil {
- t.Error(err)
- return
- }
+ require.NoError(t, err)
defer conn.Close()
for _, table := range []string{
"redo_state",
@@ -258,10 +214,7 @@ func TestSidecarTables(t *testing.T) {
"dt_participant",
} {
_, err = conn.ExecuteFetch(fmt.Sprintf("describe _vt.%s", table), 10, false)
- if err != nil {
- t.Error(err)
- return
- }
+ require.NoError(t, err)
}
}
@@ -336,10 +289,7 @@ func TestBindInSelect(t *testing.T) {
"select :bv from dual",
map[string]*querypb.BindVariable{"bv": sqltypes.StringBindVariable("abcd")},
)
- if err != nil {
- t.Error(err)
- return
- }
+ require.NoError(t, err)
want := &sqltypes.Result{
Fields: []*querypb.Field{{
Name: "abcd",
@@ -365,10 +315,7 @@ func TestBindInSelect(t *testing.T) {
"select :bv from dual",
map[string]*querypb.BindVariable{"bv": sqltypes.StringBindVariable("\x00\xff")},
)
- if err != nil {
- t.Error(err)
- return
- }
+ require.NoError(t, err)
want = &sqltypes.Result{
Fields: []*querypb.Field{{
Name: "",
@@ -392,16 +339,10 @@ func TestBindInSelect(t *testing.T) {
func TestHealth(t *testing.T) {
response, err := http.Get(fmt.Sprintf("%s/debug/health", framework.ServerAddress))
- if err != nil {
- t.Error(err)
- return
- }
+ require.NoError(t, err)
defer response.Body.Close()
result, err := io.ReadAll(response.Body)
- if err != nil {
- t.Error(err)
- return
- }
+ require.NoError(t, err)
if string(result) != "ok" {
t.Errorf("Health check: %s, want ok", result)
}
@@ -567,27 +508,18 @@ func TestDBAStatements(t *testing.T) {
client := framework.NewClient()
qr, err := client.Execute("show variables like 'version'", nil)
- if err != nil {
- t.Error(err)
- return
- }
+ require.NoError(t, err)
wantCol := sqltypes.NewVarChar("version")
if !reflect.DeepEqual(qr.Rows[0][0], wantCol) {
t.Errorf("Execute: \n%#v, want \n%#v", qr.Rows[0][0], wantCol)
}
qr, err = client.Execute("describe vitess_a", nil)
- if err != nil {
- t.Error(err)
- return
- }
+ require.NoError(t, err)
assert.Equal(t, 4, len(qr.Rows))
qr, err = client.Execute("explain vitess_a", nil)
- if err != nil {
- t.Error(err)
- return
- }
+ require.NoError(t, err)
assert.Equal(t, 4, len(qr.Rows))
}
@@ -664,37 +596,36 @@ func TestClientFoundRows(t *testing.T) {
func TestLastInsertId(t *testing.T) {
client := framework.NewClient()
_, err := client.Execute("insert ignore into vitess_autoinc_seq SET name = 'foo', sequence = 0", nil)
- if err != nil {
- t.Fatal(err)
- }
+ require.NoError(t, err)
defer client.Execute("delete from vitess_autoinc_seq where name = 'foo'", nil)
-
- if err := client.Begin(true); err != nil {
- t.Fatal(err)
- }
+ err = client.Begin(true)
+ require.NoError(t, err)
defer client.Rollback()
res, err := client.Execute("insert ignore into vitess_autoinc_seq SET name = 'foo', sequence = 0", nil)
- if err != nil {
- t.Fatal(err)
- }
+ require.NoError(t, err)
qr, err := client.Execute("update vitess_autoinc_seq set sequence=last_insert_id(sequence + 1) where name='foo'", nil)
require.NoError(t, err)
insID := res.InsertID
-
- if want, got := insID+1, qr.InsertID; want != got {
- t.Errorf("insertId mismatch; got %v, want %v", got, want)
- }
+ assert.Equal(t, insID+1, qr.InsertID, "insertID")
qr, err = client.Execute("select sequence from vitess_autoinc_seq where name = 'foo'", nil)
require.NoError(t, err)
wantCol := sqltypes.NewUint64(insID + uint64(1))
- if !reflect.DeepEqual(qr.Rows[0][0], wantCol) {
- t.Errorf("Execute: \n%#v, want \n%#v", qr.Rows[0][0], wantCol)
- }
+ assert.Truef(t, qr.Rows[0][0].Equal(wantCol), "Execute: \n%#v, want \n%#v", qr.Rows[0][0], wantCol)
+}
+
+func TestSelectLastInsertId(t *testing.T) {
+ client := framework.NewClient()
+ rs, err := client.ExecuteWithOptions("select 1 from dual where last_insert_id(42) = 42", nil, &querypb.ExecuteOptions{
+ IncludedFields: querypb.ExecuteOptions_ALL,
+ FetchLastInsertId: true,
+ })
+ require.NoError(t, err)
+ assert.EqualValues(t, 42, rs.InsertID)
}
func TestAppDebugRequest(t *testing.T) {
@@ -781,10 +712,7 @@ func TestSelectBooleanSystemVariables(t *testing.T) {
fmt.Sprintf("select :%s", tc.Variable),
map[string]*querypb.BindVariable{tc.Variable: sqltypes.BoolBindVariable(tc.Value)},
)
- if err != nil {
- t.Error(err)
- return
- }
+ require.NoError(t, err)
require.NotEmpty(t, qr.Fields, "fields should not be empty")
require.Equal(t, tc.Type, qr.Fields[0].Type, fmt.Sprintf("invalid type, wants: %+v, but got: %+v\n", tc.Type, qr.Fields[0].Type))
}
diff --git a/go/vt/vttablet/tabletmanager/restore.go b/go/vt/vttablet/tabletmanager/restore.go
index 35587124108..54813e11bf3 100644
--- a/go/vt/vttablet/tabletmanager/restore.go
+++ b/go/vt/vttablet/tabletmanager/restore.go
@@ -19,7 +19,6 @@ package tabletmanager
import (
"context"
"fmt"
- "io"
"time"
"github.com/spf13/pflag"
@@ -29,22 +28,17 @@ import (
"vitess.io/vitess/go/stats"
- "vitess.io/vitess/go/mysql"
- "vitess.io/vitess/go/vt/dbconfigs"
"vitess.io/vitess/go/vt/hook"
"vitess.io/vitess/go/vt/log"
"vitess.io/vitess/go/vt/logutil"
"vitess.io/vitess/go/vt/mysqlctl"
"vitess.io/vitess/go/vt/mysqlctl/backupstats"
- binlogdatapb "vitess.io/vitess/go/vt/proto/binlogdata"
tabletmanagerdatapb "vitess.io/vitess/go/vt/proto/tabletmanagerdata"
topodatapb "vitess.io/vitess/go/vt/proto/topodata"
vtrpcpb "vitess.io/vitess/go/vt/proto/vtrpc"
- "vitess.io/vitess/go/vt/proto/vttime"
"vitess.io/vitess/go/vt/servenv"
"vitess.io/vitess/go/vt/topo/topoproto"
"vitess.io/vitess/go/vt/vterrors"
- "vitess.io/vitess/go/vt/vttablet/tabletmanager/vreplication"
)
// This file handles the initial backup restore upon startup.
@@ -80,31 +74,6 @@ func registerIncrementalRestoreFlags(fs *pflag.FlagSet) {
fs.StringVar(&restoreToPos, "restore-to-pos", restoreToPos, "(init incremental restore parameter) if set, run a point in time recovery that ends with the given position. This will attempt to use one full backup followed by zero or more incremental backups")
}
-var (
- // Flags for PITR - old iteration
- binlogHost string
- binlogPort int
- binlogUser string
- binlogPwd string
- timeoutForGTIDLookup = 60 * time.Second
- binlogSslCa string
- binlogSslCert string
- binlogSslKey string
- binlogSslServerName string
-)
-
-func registerPointInTimeRestoreFlags(fs *pflag.FlagSet) {
- fs.StringVar(&binlogHost, "binlog_host", binlogHost, "PITR restore parameter: hostname/IP of binlog server.")
- fs.IntVar(&binlogPort, "binlog_port", binlogPort, "PITR restore parameter: port of binlog server.")
- fs.StringVar(&binlogUser, "binlog_user", binlogUser, "PITR restore parameter: username of binlog server.")
- fs.StringVar(&binlogPwd, "binlog_password", binlogPwd, "PITR restore parameter: password of binlog server.")
- fs.DurationVar(&timeoutForGTIDLookup, "pitr_gtid_lookup_timeout", timeoutForGTIDLookup, "PITR restore parameter: timeout for fetching gtid from timestamp.")
- fs.StringVar(&binlogSslCa, "binlog_ssl_ca", binlogSslCa, "PITR restore parameter: Filename containing TLS CA certificate to verify binlog server TLS certificate against.")
- fs.StringVar(&binlogSslCert, "binlog_ssl_cert", binlogSslCert, "PITR restore parameter: Filename containing mTLS client certificate to present to binlog server as authentication.")
- fs.StringVar(&binlogSslKey, "binlog_ssl_key", binlogSslKey, "PITR restore parameter: Filename containing mTLS client private key for use in binlog server authentication.")
- fs.StringVar(&binlogSslServerName, "binlog_ssl_server_name", binlogSslServerName, "PITR restore parameter: TLS server name (common name) to verify against for the binlog server we are connecting to (If not set: use the hostname or IP supplied in --binlog_host).")
-}
-
func init() {
servenv.OnParseFor("vtcombo", registerRestoreFlags)
servenv.OnParseFor("vttablet", registerRestoreFlags)
@@ -112,9 +81,6 @@ func init() {
servenv.OnParseFor("vtcombo", registerIncrementalRestoreFlags)
servenv.OnParseFor("vttablet", registerIncrementalRestoreFlags)
- servenv.OnParseFor("vtcombo", registerPointInTimeRestoreFlags)
- servenv.OnParseFor("vttablet", registerPointInTimeRestoreFlags)
-
statsRestoreBackupTime = stats.NewString("RestoredBackupTime")
statsRestoreBackupPosition = stats.NewString("RestorePosition")
}
@@ -299,15 +265,6 @@ func (tm *TabletManager) restoreDataLocked(ctx context.Context, logger logutil.L
pos = backupManifest.Position
params.Logger.Infof("Restore: pos=%v", replication.EncodePosition(pos))
}
- // If SnapshotTime is set , then apply the incremental change
- if keyspaceInfo.SnapshotTime != nil {
- params.Logger.Infof("Restore: Restoring to time %v from binlog", keyspaceInfo.SnapshotTime)
- err = tm.restoreToTimeFromBinlog(ctx, pos, keyspaceInfo.SnapshotTime)
- if err != nil {
- log.Errorf("unable to restore to the specified time %s, error : %v", keyspaceInfo.SnapshotTime.String(), err)
- return nil
- }
- }
switch {
case err == nil && backupManifest != nil:
// Starting from here we won't be able to recover if we get stopped by a cancelled
@@ -365,196 +322,6 @@ func (tm *TabletManager) restoreDataLocked(ctx context.Context, logger logutil.L
return tm.tmState.ChangeTabletType(bgCtx, originalType, DBActionNone)
}
-// restoreToTimeFromBinlog restores to the snapshot time of the keyspace
-// currently this works with mysql based database only (as it uses mysql specific queries for restoring)
-func (tm *TabletManager) restoreToTimeFromBinlog(ctx context.Context, pos replication.Position, restoreTime *vttime.Time) error {
- // validate the minimal settings necessary for connecting to binlog server
- if binlogHost == "" || binlogPort <= 0 || binlogUser == "" {
- log.Warning("invalid binlog server setting, restoring to last available backup.")
- return nil
- }
-
- timeoutCtx, cancelFnc := context.WithTimeout(ctx, timeoutForGTIDLookup)
- defer cancelFnc()
-
- afterGTIDPos, beforeGTIDPos, err := tm.getGTIDFromTimestamp(timeoutCtx, pos, restoreTime.Seconds)
- if err != nil {
- return err
- }
-
- if afterGTIDPos == "" && beforeGTIDPos == "" {
- return vterrors.New(vtrpcpb.Code_FAILED_PRECONDITION, fmt.Sprintf("unable to fetch the GTID for the specified time - %s", restoreTime.String()))
- } else if afterGTIDPos == "" && beforeGTIDPos != "" {
- log.Info("no afterGTIDPos found, which implies we reached the end of all GTID events")
- }
-
- log.Infof("going to restore upto the GTID - %s", afterGTIDPos)
- // when we don't have before GTID, we will take it as current backup pos's last GTID
- // this is case where someone tries to restore just to the 1st event after backup
- if beforeGTIDPos == "" {
- beforeGTIDPos = pos.GTIDSet.Last()
- }
- err = tm.catchupToGTID(timeoutCtx, afterGTIDPos, beforeGTIDPos)
- if err != nil {
- return vterrors.Wrapf(err, "unable to replicate upto desired GTID : %s", afterGTIDPos)
- }
-
- return nil
-}
-
-// getGTIDFromTimestamp computes 2 GTIDs based on restoreTime
-// afterPos is the GTID of the first event at or after restoreTime.
-// beforePos is the GTID of the last event before restoreTime. This is the GTID upto which replication will be applied
-// afterPos can be used directly in the query `START SLAVE UNTIL SQL_BEFORE_GTIDS = ”`
-// beforePos will be used to check if replication was able to catch up from the binlog server
-func (tm *TabletManager) getGTIDFromTimestamp(ctx context.Context, pos replication.Position, restoreTime int64) (afterPos string, beforePos string, err error) {
- connParams := &mysql.ConnParams{
- Host: binlogHost,
- Port: binlogPort,
- Uname: binlogUser,
- SslCa: binlogSslCa,
- SslCert: binlogSslCert,
- SslKey: binlogSslKey,
- ServerName: binlogSslServerName,
- }
- if binlogPwd != "" {
- connParams.Pass = binlogPwd
- }
- if binlogSslCa != "" || binlogSslCert != "" {
- connParams.EnableSSL()
- }
- dbCfgs := &dbconfigs.DBConfigs{
- Host: connParams.Host,
- Port: connParams.Port,
- }
- dbCfgs.SetDbParams(*connParams, *connParams, *connParams)
- vsClient := vreplication.NewReplicaConnector(tm.Env, connParams)
-
- filter := &binlogdatapb.Filter{
- Rules: []*binlogdatapb.Rule{{
- Match: "/.*",
- }},
- }
-
- // get current lastPos of binlog server, so that if we hit that in vstream, we'll return from there
- binlogConn, err := mysql.Connect(ctx, connParams)
- if err != nil {
- return "", "", err
- }
- defer binlogConn.Close()
- lastPos, err := binlogConn.PrimaryPosition()
- if err != nil {
- return "", "", err
- }
-
- gtidsChan := make(chan []string, 1)
-
- go func() {
- err := vsClient.VStream(ctx, replication.EncodePosition(pos), filter, func(events []*binlogdatapb.VEvent) error {
- for _, event := range events {
- if event.Gtid != "" {
- // check if we reached the lastPos then return
- eventPos, err := replication.DecodePosition(event.Gtid)
- if err != nil {
- return err
- }
-
- if event.Timestamp >= restoreTime {
- afterPos = event.Gtid
- gtidsChan <- []string{event.Gtid, beforePos}
- return io.EOF
- }
-
- if eventPos.AtLeast(lastPos) {
- gtidsChan <- []string{"", beforePos}
- return io.EOF
- }
- beforePos = event.Gtid
- }
- }
- return nil
- })
- if err != nil && err != io.EOF {
- log.Warningf("Error using VStream to find timestamp for GTID position: %v error: %v", pos, err)
- gtidsChan <- []string{"", ""}
- }
- }()
- defer vsClient.Close()
- select {
- case val := <-gtidsChan:
- return val[0], val[1], nil
- case <-ctx.Done():
- log.Warningf("Can't find the GTID from restore time stamp, exiting.")
- return "", beforePos, vterrors.New(vtrpcpb.Code_FAILED_PRECONDITION, "unable to find GTID from the snapshot time as context timed out")
- }
-}
-
-// catchupToGTID replicates upto specified GTID from binlog server
-//
-// copies the data from binlog server by pointing to as replica
-// waits till all events to GTID replicated
-// once done, it will reset the replication
-func (tm *TabletManager) catchupToGTID(ctx context.Context, afterGTIDPos string, beforeGTIDPos string) error {
- var afterGTID replication.Position
- if afterGTIDPos != "" {
- var err error
- afterGTID, err = replication.DecodePosition(afterGTIDPos)
- if err != nil {
- return err
- }
- }
-
- beforeGTIDPosParsed, err := replication.DecodePosition(beforeGTIDPos)
- if err != nil {
- return err
- }
-
- if err := tm.MysqlDaemon.CatchupToGTID(ctx, afterGTID); err != nil {
- return vterrors.Wrap(err, fmt.Sprintf("failed to restart the replication until %s GTID", afterGTID.GTIDSet.Last()))
- }
- log.Infof("Waiting for position to reach", beforeGTIDPosParsed.GTIDSet.Last())
- // Could not use `agent.MysqlDaemon.WaitSourcePos` as replication is stopped with `START REPLICA UNTIL SQL_BEFORE_GTIDS`
- // this is as per https://dev.mysql.com/doc/refman/8.0/en/start-replica.html
- // We need to wait until replication catches upto the specified afterGTIDPos
- chGTIDCaughtup := make(chan bool)
- go func() {
- timeToWait := time.Now().Add(timeoutForGTIDLookup)
- for time.Now().Before(timeToWait) {
- pos, err := tm.MysqlDaemon.PrimaryPosition(ctx)
- if err != nil {
- chGTIDCaughtup <- false
- }
-
- if pos.AtLeast(beforeGTIDPosParsed) {
- chGTIDCaughtup <- true
- }
- select {
- case <-ctx.Done():
- chGTIDCaughtup <- false
- default:
- time.Sleep(300 * time.Millisecond)
- }
- }
- }()
- select {
- case resp := <-chGTIDCaughtup:
- if resp {
- if err := tm.MysqlDaemon.StopReplication(ctx, nil); err != nil {
- return vterrors.Wrap(err, "failed to stop replication")
- }
- if err := tm.MysqlDaemon.ResetReplicationParameters(ctx); err != nil {
- return vterrors.Wrap(err, "failed to reset replication")
- }
-
- return nil
- }
- return vterrors.Wrap(err, "error while fetching the current GTID position")
- case <-ctx.Done():
- log.Warningf("Could not copy up to GTID.")
- return vterrors.Wrapf(err, "context timeout while restoring up to specified GTID - %s", beforeGTIDPos)
- }
-}
-
// disableReplication stops and resets replication on the mysql server. It moreover sets impossible replication
// source params, so that the replica can't possibly reconnect. It would take a `CHANGE [MASTER|REPLICATION SOURCE] TO ...` to
// make the mysql server replicate again (available via tm.MysqlDaemon.SetReplicationPosition)
diff --git a/go/vt/vttablet/tabletmanager/rpc_replication.go b/go/vt/vttablet/tabletmanager/rpc_replication.go
index f13efa66124..47794e92b9a 100644
--- a/go/vt/vttablet/tabletmanager/rpc_replication.go
+++ b/go/vt/vttablet/tabletmanager/rpc_replication.go
@@ -19,6 +19,7 @@ package tabletmanager
import (
"context"
"fmt"
+ "runtime"
"strings"
"time"
@@ -29,6 +30,7 @@ import (
"vitess.io/vitess/go/vt/log"
"vitess.io/vitess/go/vt/mysqlctl"
"vitess.io/vitess/go/vt/proto/vtrpc"
+ "vitess.io/vitess/go/vt/topo"
"vitess.io/vitess/go/vt/topo/topoproto"
"vitess.io/vitess/go/vt/vterrors"
"vitess.io/vitess/go/vt/vttablet/tabletserver"
@@ -524,6 +526,23 @@ func (tm *TabletManager) demotePrimary(ctx context.Context, revertPartialFailure
}
defer tm.unlock()
+ finishCtx, cancel := context.WithCancel(context.Background())
+ defer cancel()
+ go func() {
+ select {
+ case <-finishCtx.Done():
+ // Finished running DemotePrimary. Nothing to do.
+ case <-time.After(10 * topo.RemoteOperationTimeout):
+ // We waited for over 10 times of remote operation timeout, but DemotePrimary is still not done.
+ // Collect more information and signal demote primary is indefinitely stalled.
+ log.Errorf("DemotePrimary seems to be stalled. Collecting more information.")
+ tm.QueryServiceControl.SetDemotePrimaryStalled()
+ buf := make([]byte, 1<<16) // 64 KB buffer size
+ stackSize := runtime.Stack(buf, true)
+ log.Errorf("Stack trace:\n%s", string(buf[:stackSize]))
+ }
+ }()
+
tablet := tm.Tablet()
wasPrimary := tablet.Type == topodatapb.TabletType_PRIMARY
wasServing := tm.QueryServiceControl.IsServing()
diff --git a/go/vt/vttablet/tabletmanager/rpc_replication_test.go b/go/vt/vttablet/tabletmanager/rpc_replication_test.go
index c587f1e24b8..b388235811b 100644
--- a/go/vt/vttablet/tabletmanager/rpc_replication_test.go
+++ b/go/vt/vttablet/tabletmanager/rpc_replication_test.go
@@ -18,10 +18,15 @@ package tabletmanager
import (
"context"
+ "sync/atomic"
"testing"
"time"
"github.com/stretchr/testify/require"
+ "golang.org/x/sync/semaphore"
+
+ "vitess.io/vitess/go/vt/topo"
+ "vitess.io/vitess/go/vt/vttablet/tabletserver"
)
// TestWaitForGrantsToHaveApplied tests that waitForGrantsToHaveApplied only succeeds after waitForDBAGrants has been called.
@@ -42,3 +47,49 @@ func TestWaitForGrantsToHaveApplied(t *testing.T) {
err = tm.waitForGrantsToHaveApplied(secondContext)
require.NoError(t, err)
}
+
+type demotePrimaryStallQS struct {
+ tabletserver.Controller
+ waitTime time.Duration
+ primaryStalled atomic.Bool
+}
+
+func (d *demotePrimaryStallQS) SetDemotePrimaryStalled() {
+ d.primaryStalled.Store(true)
+}
+
+func (d *demotePrimaryStallQS) IsServing() bool {
+ time.Sleep(d.waitTime)
+ return false
+}
+
+// TestDemotePrimaryStalled checks that if demote primary takes too long, then we mark it as stalled.
+func TestDemotePrimaryStalled(t *testing.T) {
+ // Set remote operation timeout to a very low value.
+ origVal := topo.RemoteOperationTimeout
+ topo.RemoteOperationTimeout = 100 * time.Millisecond
+ defer func() {
+ topo.RemoteOperationTimeout = origVal
+ }()
+
+ // Create a fake query service control to intercept calls from DemotePrimary function.
+ qsc := &demotePrimaryStallQS{
+ waitTime: 2 * time.Second,
+ }
+ // Create a tablet manager with a replica type tablet.
+ tm := &TabletManager{
+ actionSema: semaphore.NewWeighted(1),
+ MysqlDaemon: newTestMysqlDaemon(t, 1),
+ tmState: &tmState{
+ displayState: displayState{
+ tablet: newTestTablet(t, 100, "ks", "-", map[string]string{}),
+ },
+ },
+ QueryServiceControl: qsc,
+ }
+
+ // We make IsServing stall for over 2 seconds, which is longer than 10 * remote operation timeout.
+ // This should cause the demote primary operation to be stalled.
+ tm.demotePrimary(context.Background(), false)
+ require.True(t, qsc.primaryStalled.Load())
+}
diff --git a/go/vt/vttablet/tabletmanager/vdiff/shard_streamer.go b/go/vt/vttablet/tabletmanager/vdiff/shard_streamer.go
index 6d016709cce..03be2271d34 100644
--- a/go/vt/vttablet/tabletmanager/vdiff/shard_streamer.go
+++ b/go/vt/vttablet/tabletmanager/vdiff/shard_streamer.go
@@ -37,9 +37,11 @@ type shardStreamer struct {
err error
}
+var _ engine.StreamExecutor = (*shardStreamer)(nil)
+
// StreamExecute implements the StreamExecutor interface of the Primitive executor and
// it simply waits for a result to be available for this shard and sends it to the merge sorter.
-func (sm *shardStreamer) StreamExecute(ctx context.Context, vcursor engine.VCursor, bindVars map[string]*querypb.BindVariable, wantfields bool, callback func(*sqltypes.Result) error) error {
+func (sm *shardStreamer) StreamExecute(_ context.Context, _ engine.VCursor, _ map[string]*querypb.BindVariable, _, _ bool, callback func(*sqltypes.Result) error) error {
for result := range sm.result {
if err := callback(result); err != nil {
return err
diff --git a/go/vt/vttablet/tabletmanager/vreplication/framework_test.go b/go/vt/vttablet/tabletmanager/vreplication/framework_test.go
index 12a05a69dbc..9f2647a8770 100644
--- a/go/vt/vttablet/tabletmanager/vreplication/framework_test.go
+++ b/go/vt/vttablet/tabletmanager/vreplication/framework_test.go
@@ -166,8 +166,12 @@ func setup(ctx context.Context) (func(), int) {
return cleanup, 0
}
-// We run Tests twice, first with full binlog_row_image, then with noblob.
-var runNoBlobTest = false
+var (
+ // We run unit tests twice, first with binlog_row_image=FULL, then with NOBLOB.
+ runNoBlobTest = false
+ // When using MySQL 8.0 or later, we set binlog_row_value_options=PARTIAL_JSON.
+ runPartialJSONTest = false
+)
// We use this tempDir for creating the external cnfs, since we create the test cluster afterwards.
const tempDir = "/tmp"
@@ -178,10 +182,14 @@ func TestMain(m *testing.M) {
exitCode := func() int {
ctx, cancel := context.WithCancel(context.Background())
defer cancel()
- if err := utils.SetBinlogRowImageMode("full", tempDir); err != nil {
+ // binlog-row-value-options=PARTIAL_JSON is only supported in MySQL 8.0 and later.
+ // We still run unit tests with MySQL 5.7, so we cannot add it to the cnf file
+ // when using 5.7 or mysqld will fail to start.
+ runPartialJSONTest = utils.CIDBPlatformIsMySQL8orLater()
+ if err := utils.SetBinlogRowImageOptions("full", runPartialJSONTest, tempDir); err != nil {
panic(err)
}
- defer utils.SetBinlogRowImageMode("", tempDir)
+ defer utils.SetBinlogRowImageOptions("", false, tempDir)
cancel, ret := setup(ctx)
if ret > 0 {
return ret
@@ -193,10 +201,10 @@ func TestMain(m *testing.M) {
cancel()
runNoBlobTest = true
- if err := utils.SetBinlogRowImageMode("noblob", tempDir); err != nil {
+ if err := utils.SetBinlogRowImageOptions("noblob", runPartialJSONTest, tempDir); err != nil {
panic(err)
}
- defer utils.SetBinlogRowImageMode("", tempDir)
+ defer utils.SetBinlogRowImageOptions("", false, tempDir)
cancel, ret = setup(ctx)
if ret > 0 {
return ret
diff --git a/go/vt/vttablet/tabletmanager/vreplication/replicator_plan.go b/go/vt/vttablet/tabletmanager/vreplication/replicator_plan.go
index 62d6166b5ca..a201ce25847 100644
--- a/go/vt/vttablet/tabletmanager/vreplication/replicator_plan.go
+++ b/go/vt/vttablet/tabletmanager/vreplication/replicator_plan.go
@@ -17,8 +17,10 @@ limitations under the License.
package vreplication
import (
+ "bytes"
"encoding/json"
"fmt"
+ "slices"
"sort"
"strings"
@@ -28,6 +30,8 @@ import (
"vitess.io/vitess/go/mysql/collations/colldata"
vjson "vitess.io/vitess/go/mysql/json"
"vitess.io/vitess/go/mysql/sqlerror"
+ "vitess.io/vitess/go/ptr"
+ "vitess.io/vitess/go/sqlescape"
"vitess.io/vitess/go/sqltypes"
"vitess.io/vitess/go/vt/binlog/binlogplayer"
"vitess.io/vitess/go/vt/sqlparser"
@@ -363,7 +367,10 @@ func (tp *TablePlan) bindFieldVal(field *querypb.Field, val *sqltypes.Value) (*q
func (tp *TablePlan) applyChange(rowChange *binlogdatapb.RowChange, executor func(string) (*sqltypes.Result, error)) (*sqltypes.Result, error) {
// MakeRowTrusted is needed here because Proto3ToResult is not convenient.
- var before, after bool
+ var (
+ before, after bool
+ afterVals []sqltypes.Value
+ )
bindvars := make(map[string]*querypb.BindVariable, len(tp.Fields))
if rowChange.Before != nil {
before = true
@@ -377,24 +384,48 @@ func (tp *TablePlan) applyChange(rowChange *binlogdatapb.RowChange, executor fun
}
}
if rowChange.After != nil {
+ jsonIndex := 0
after = true
- vals := sqltypes.MakeRowTrusted(tp.Fields, rowChange.After)
+ afterVals = sqltypes.MakeRowTrusted(tp.Fields, rowChange.After)
for i, field := range tp.Fields {
- var bindVar *querypb.BindVariable
- var newVal *sqltypes.Value
- var err error
+ var (
+ bindVar *querypb.BindVariable
+ newVal *sqltypes.Value
+ err error
+ )
if field.Type == querypb.Type_JSON {
- if vals[i].IsNull() { // An SQL NULL and not an actual JSON value
+ switch {
+ case afterVals[i].IsNull(): // An SQL NULL and not an actual JSON value
newVal = &sqltypes.NULL
- } else { // A JSON value (which may be a JSON null literal value)
- newVal, err = vjson.MarshalSQLValue(vals[i].Raw())
+ case rowChange.JsonPartialValues != nil && isBitSet(rowChange.JsonPartialValues.Cols, jsonIndex) &&
+ !slices.Equal(afterVals[i].Raw(), sqltypes.NullBytes):
+ // An SQL expression that can be converted to a JSON value such as JSON_INSERT().
+ // This occurs when using partial JSON values as a result of mysqld using
+ // binlog-row-value-options=PARTIAL_JSON.
+ if len(afterVals[i].Raw()) == 0 {
+ // If the JSON column was NOT updated then the JSON column is marked as
+ // partial and the diff is empty as a way to exclude it from the AFTER image.
+ // It still has the data bit set, however, even though it's not really
+ // present. So we have to account for this by unsetting the data bit so
+ // that the column's current JSON value is not lost.
+ setBit(rowChange.DataColumns.Cols, i, false)
+ newVal = ptr.Of(sqltypes.MakeTrusted(querypb.Type_EXPRESSION, nil))
+ } else {
+ escapedName := sqlescape.EscapeID(field.Name)
+ newVal = ptr.Of(sqltypes.MakeTrusted(querypb.Type_EXPRESSION, []byte(
+ fmt.Sprintf(afterVals[i].RawStr(), escapedName),
+ )))
+ }
+ default: // A JSON value (which may be a JSON null literal value)
+ newVal, err = vjson.MarshalSQLValue(afterVals[i].Raw())
if err != nil {
return nil, err
}
}
bindVar, err = tp.bindFieldVal(field, newVal)
+ jsonIndex++
} else {
- bindVar, err = tp.bindFieldVal(field, &vals[i])
+ bindVar, err = tp.bindFieldVal(field, &afterVals[i])
}
if err != nil {
return nil, err
@@ -404,7 +435,7 @@ func (tp *TablePlan) applyChange(rowChange *binlogdatapb.RowChange, executor fun
}
switch {
case !before && after:
- // only apply inserts for rows whose primary keys are within the range of rows already copied
+ // Only apply inserts for rows whose primary keys are within the range of rows already copied.
if tp.isOutsidePKRange(bindvars, before, after, "insert") {
return nil, nil
}
@@ -444,6 +475,61 @@ func (tp *TablePlan) applyChange(rowChange *binlogdatapb.RowChange, executor fun
if tp.isOutsidePKRange(bindvars, before, after, "insert") {
return nil, nil
}
+ if tp.isPartial(rowChange) {
+ // We need to use a combination of the values in the BEFORE and AFTER image to generate the
+ // new row.
+ jsonIndex := 0
+ for i, field := range tp.Fields {
+ if field.Type == querypb.Type_JSON && rowChange.JsonPartialValues != nil {
+ switch {
+ case !isBitSet(rowChange.JsonPartialValues.Cols, jsonIndex):
+ // We use the full AFTER value which we already have.
+ case len(afterVals[i].Raw()) == 0:
+ // If the JSON column was NOT updated then the JSON column is marked as partial
+ // and the diff is empty as a way to exclude it from the AFTER image. So we
+ // want to use the BEFORE image value.
+ beforeVal, err := vjson.MarshalSQLValue(bindvars["b_"+field.Name].Value)
+ if err != nil {
+ return nil, vterrors.Wrapf(err, "failed to convert JSON to SQL field value for %s.%s when building insert query",
+ tp.TargetName, field.Name)
+ }
+ bindvars["a_"+field.Name], err = tp.bindFieldVal(field, beforeVal)
+ if err != nil {
+ return nil, vterrors.Wrapf(err, "failed to bind field value for %s.%s when building insert query",
+ tp.TargetName, field.Name)
+ }
+ default:
+ // For JSON columns when binlog-row-value-options=PARTIAL_JSON is used and the
+ // column is marked as partial, we need to wrap the JSON diff function(s)
+ // around the BEFORE value.
+ diff := afterVals[i].RawStr()
+ beforeVal := bindvars["b_"+field.Name].Value
+ buf := bytes.Buffer{}
+ buf.Grow(len(beforeVal) + len(sqlparser.Utf8mb4Str) + 2) // +2 is for the enclosing quotes
+ buf.WriteString(sqlparser.Utf8mb4Str)
+ buf.WriteByte('\'')
+ buf.Write(beforeVal)
+ buf.WriteByte('\'')
+ newVal := sqltypes.MakeTrusted(querypb.Type_EXPRESSION, []byte(
+ fmt.Sprintf(diff, buf.String()),
+ ))
+ bv, err := tp.bindFieldVal(field, &newVal)
+ if err != nil {
+ return nil, vterrors.Wrapf(err, "failed to bind field value for %s.%s when building insert query",
+ tp.TargetName, field.Name)
+ }
+ bindvars["a_"+field.Name] = bv
+ }
+ jsonIndex++
+ continue
+ }
+ if !isBitSet(rowChange.DataColumns.Cols, i) {
+ return nil, vterrors.Errorf(vtrpcpb.Code_INTERNAL,
+ "binary log event missing a needed value for %s.%s due to not using binlog-row-image=FULL; you will need to re-run the workflow with binlog-row-image=FULL",
+ tp.TargetName, field.Name)
+ }
+ }
+ }
return execParsedQuery(tp.Insert, bindvars, executor)
}
// Unreachable.
@@ -540,11 +626,28 @@ func (tp *TablePlan) applyBulkInsertChanges(rowInserts []*binlogdatapb.RowChange
newStmt := true
for _, rowInsert := range rowInserts {
+ var (
+ err error
+ bindVar *querypb.BindVariable
+ )
rowValues := &strings.Builder{}
bindvars := make(map[string]*querypb.BindVariable, len(tp.Fields))
vals := sqltypes.MakeRowTrusted(tp.Fields, rowInsert.After)
for n, field := range tp.Fields {
- bindVar, err := tp.bindFieldVal(field, &vals[n])
+ if field.Type == querypb.Type_JSON {
+ var jsVal *sqltypes.Value
+ if vals[n].IsNull() { // An SQL NULL and not an actual JSON value
+ jsVal = &sqltypes.NULL
+ } else { // A JSON value (which may be a JSON null literal value)
+ jsVal, err = vjson.MarshalSQLValue(vals[n].Raw())
+ if err != nil {
+ return nil, err
+ }
+ }
+ bindVar, err = tp.bindFieldVal(field, jsVal)
+ } else {
+ bindVar, err = tp.bindFieldVal(field, &vals[n])
+ }
if err != nil {
return nil, err
}
diff --git a/go/vt/vttablet/tabletmanager/vreplication/table_plan_partial.go b/go/vt/vttablet/tabletmanager/vreplication/table_plan_partial.go
index 85e0fd8e50f..bc3088bbb44 100644
--- a/go/vt/vttablet/tabletmanager/vreplication/table_plan_partial.go
+++ b/go/vt/vttablet/tabletmanager/vreplication/table_plan_partial.go
@@ -26,7 +26,6 @@ import (
"vitess.io/vitess/go/vt/log"
"vitess.io/vitess/go/vt/sqlparser"
"vitess.io/vitess/go/vt/vterrors"
- vttablet "vitess.io/vitess/go/vt/vttablet/common"
)
// isBitSet returns true if the bit at index is set
@@ -36,14 +35,22 @@ func isBitSet(data []byte, index int) bool {
return data[byteIndex]&bitMask > 0
}
-func (tp *TablePlan) isPartial(rowChange *binlogdatapb.RowChange) bool {
- if (tp.WorkflowConfig.ExperimentalFlags /**/ & /**/ vttablet.VReplicationExperimentalFlagAllowNoBlobBinlogRowImage) == 0 ||
- rowChange.DataColumns == nil ||
- rowChange.DataColumns.Count == 0 {
+func setBit(data []byte, index int, value bool) {
+ byteIndex := index / 8
+ bitMask := byte(1 << (uint(index) & 0x7))
+ if value {
+ data[byteIndex] |= bitMask
+ } else {
+ data[byteIndex] &= 0xff - bitMask
+ }
+}
+func (tp *TablePlan) isPartial(rowChange *binlogdatapb.RowChange) bool {
+ if rowChange == nil {
return false
}
- return true
+ return (rowChange.DataColumns != nil && rowChange.DataColumns.Count > 0) ||
+ (rowChange.JsonPartialValues != nil && rowChange.JsonPartialValues.Count > 0)
}
func (tpb *tablePlanBuilder) generatePartialValuesPart(buf *sqlparser.TrackedBuffer, bvf *bindvarFormatter, dataColumns *binlogdatapb.RowChange_Bitmap) *sqlparser.ParsedQuery {
diff --git a/go/vt/vttablet/tabletmanager/vreplication/vplayer_flaky_test.go b/go/vt/vttablet/tabletmanager/vreplication/vplayer_flaky_test.go
index 50d93e60e5a..1267ad5e20c 100644
--- a/go/vt/vttablet/tabletmanager/vreplication/vplayer_flaky_test.go
+++ b/go/vt/vttablet/tabletmanager/vreplication/vplayer_flaky_test.go
@@ -1519,6 +1519,296 @@ func TestPlayerRowMove(t *testing.T) {
validateQueryCountStat(t, "replicate", 3)
}
+// TestPlayerPartialImages tests the behavior of the vplayer when modifying
+// a table with BLOB and JSON columns, including when modifying the Primary
+// Key for a row, when we have partial binlog images, meaning that
+// binlog-row-image=NOBLOB and/or binlog-row-value-options=PARTIAL_JSON.
+func TestPlayerPartialImages(t *testing.T) {
+ if !runPartialJSONTest {
+ t.Skip("Skipping test as binlog_row_value_options=PARTIAL_JSON is not enabled")
+ }
+
+ defer deleteTablet(addTablet(100))
+ execStatements(t, []string{
+ "create table src (id int, jd json, bd blob, primary key(id))",
+ fmt.Sprintf("create table %s.dst (id int, jd json, bd blob, primary key(id))", vrepldb),
+ })
+ defer execStatements(t, []string{
+ "drop table src",
+ fmt.Sprintf("drop table %s.dst", vrepldb),
+ })
+
+ filter := &binlogdatapb.Filter{
+ Rules: []*binlogdatapb.Rule{{
+ Match: "dst",
+ Filter: "select * from src",
+ }},
+ }
+ bls := &binlogdatapb.BinlogSource{
+ Keyspace: env.KeyspaceName,
+ Shard: env.ShardName,
+ Filter: filter,
+ OnDdl: binlogdatapb.OnDDLAction_IGNORE,
+ }
+ cancel, _ := startVReplication(t, bls, "")
+ defer cancel()
+
+ type testCase struct {
+ input string
+ output []string
+ data [][]string
+ error string
+ }
+
+ var testCases []testCase
+
+ if vttablet.DefaultVReplicationConfig.ExperimentalFlags&vttablet.VReplicationExperimentalFlagVPlayerBatching == 0 {
+ testCases = append(testCases, testCase{
+ input: "insert into src (id, jd, bd) values (1,'{\"key1\": \"val1\"}','blob data'), (2,'{\"key2\": \"val2\"}','blob data2'), (3,'{\"key3\": \"val3\"}','blob data3')",
+ output: []string{
+ "insert into dst(id,jd,bd) values (1,JSON_OBJECT(_utf8mb4'key1', _utf8mb4'val1'),_binary'blob data')",
+ "insert into dst(id,jd,bd) values (2,JSON_OBJECT(_utf8mb4'key2', _utf8mb4'val2'),_binary'blob data2')",
+ "insert into dst(id,jd,bd) values (3,JSON_OBJECT(_utf8mb4'key3', _utf8mb4'val3'),_binary'blob data3')",
+ },
+ data: [][]string{
+ {"1", "{\"key1\": \"val1\"}", "blob data"},
+ {"2", "{\"key2\": \"val2\"}", "blob data2"},
+ {"3", "{\"key3\": \"val3\"}", "blob data3"},
+ },
+ })
+ } else {
+ testCases = append(testCases, testCase{
+ input: "insert into src (id, jd, bd) values (1,'{\"key1\": \"val1\"}','blob data'), (2,'{\"key2\": \"val2\"}','blob data2'), (3,'{\"key3\": \"val3\"}','blob data3')",
+ output: []string{
+ "insert into dst(id,jd,bd) values (1,JSON_OBJECT(_utf8mb4'key1', _utf8mb4'val1'),_binary'blob data'), (2,JSON_OBJECT(_utf8mb4'key2', _utf8mb4'val2'),_binary'blob data2'), (3,JSON_OBJECT(_utf8mb4'key3', _utf8mb4'val3'),_binary'blob data3')",
+ },
+ data: [][]string{
+ {"1", "{\"key1\": \"val1\"}", "blob data"},
+ {"2", "{\"key2\": \"val2\"}", "blob data2"},
+ {"3", "{\"key3\": \"val3\"}", "blob data3"},
+ },
+ })
+ }
+ if runNoBlobTest {
+ testCases = append(testCases, testCase{
+ input: `update src set jd=JSON_SET(jd, '$.color', 'red') where id = 1`,
+ output: []string{
+ "update dst set jd=JSON_INSERT(`jd`, _utf8mb4'$.color', CAST(JSON_QUOTE(_utf8mb4'red') as JSON)) where id=1",
+ },
+ data: [][]string{
+ {"1", "{\"key1\": \"val1\", \"color\": \"red\"}", "blob data"},
+ {"2", "{\"key2\": \"val2\"}", "blob data2"},
+ {"3", "{\"key3\": \"val3\"}", "blob data3"},
+ },
+ })
+ } else {
+ testCases = append(testCases, testCase{
+ input: `update src set jd=JSON_SET(jd, '$.color', 'red') where id = 1`,
+ output: []string{
+ "update dst set jd=JSON_INSERT(`jd`, _utf8mb4'$.color', CAST(JSON_QUOTE(_utf8mb4'red') as JSON)), bd=_binary'blob data' where id=1",
+ },
+ data: [][]string{
+ {"1", "{\"key1\": \"val1\", \"color\": \"red\"}", "blob data"},
+ {"2", "{\"key2\": \"val2\"}", "blob data2"},
+ {"3", "{\"key3\": \"val3\"}", "blob data3"},
+ },
+ })
+ }
+ testCases = append(testCases, []testCase{
+ {
+ input: `update src set bd = 'new blob data' where id = 2`,
+ output: []string{
+ "update dst set bd=_binary'new blob data' where id=2",
+ },
+ data: [][]string{
+ {"1", "{\"key1\": \"val1\", \"color\": \"red\"}", "blob data"},
+ {"2", "{\"key2\": \"val2\"}", "new blob data"},
+ {"3", "{\"key3\": \"val3\"}", "blob data3"},
+ },
+ },
+ {
+ input: `update src set id = id+10, bd = 'newest blob data' where id = 2`,
+ output: []string{
+ "delete from dst where id=2",
+ "insert into dst(id,jd,bd) values (12,JSON_OBJECT(_utf8mb4'key2', _utf8mb4'val2'),_binary'newest blob data')",
+ },
+ data: [][]string{
+ {"1", "{\"key1\": \"val1\", \"color\": \"red\"}", "blob data"},
+ {"3", "{\"key3\": \"val3\"}", "blob data3"},
+ {"12", "{\"key2\": \"val2\"}", "newest blob data"},
+ },
+ },
+ }...)
+ if runNoBlobTest {
+ testCases = append(testCases, []testCase{
+ {
+ input: `update src set jd=JSON_SET(jd, '$.years', 5) where id = 1`,
+ output: []string{
+ "update dst set jd=JSON_INSERT(`jd`, _utf8mb4'$.years', CAST(5 as JSON)) where id=1",
+ },
+ data: [][]string{
+ {"1", "{\"key1\": \"val1\", \"color\": \"red\", \"years\": 5}", "blob data"},
+ {"3", "{\"key3\": \"val3\"}", "blob data3"},
+ {"12", "{\"key2\": \"val2\"}", "newest blob data"},
+ },
+ },
+ {
+ input: `update src set jd=JSON_SET(jd, '$.hobbies', JSON_ARRAY('skiing', 'video games', 'hiking')) where id = 1`,
+ output: []string{
+ "update dst set jd=JSON_INSERT(`jd`, _utf8mb4'$.hobbies', JSON_ARRAY(_utf8mb4'skiing', _utf8mb4'video games', _utf8mb4'hiking')) where id=1",
+ },
+ data: [][]string{
+ {"1", "{\"key1\": \"val1\", \"color\": \"red\", \"years\": 5, \"hobbies\": [\"skiing\", \"video games\", \"hiking\"]}", "blob data"},
+ {"3", "{\"key3\": \"val3\"}", "blob data3"},
+ {"12", "{\"key2\": \"val2\"}", "newest blob data"},
+ },
+ },
+ {
+ input: `update src set jd=JSON_SET(jd, '$.misc', '{"address":"1012 S Park", "town":"Hastings", "state":"MI"}') where id = 12`,
+ output: []string{
+ "update dst set jd=JSON_INSERT(`jd`, _utf8mb4'$.misc', CAST(JSON_QUOTE(_utf8mb4'{\"address\":\"1012 S Park\", \"town\":\"Hastings\", \"state\":\"MI\"}') as JSON)) where id=12",
+ },
+ data: [][]string{
+ {"1", "{\"key1\": \"val1\", \"color\": \"red\", \"years\": 5, \"hobbies\": [\"skiing\", \"video games\", \"hiking\"]}", "blob data"},
+ {"3", "{\"key3\": \"val3\"}", "blob data3"},
+ {"12", "{\"key2\": \"val2\", \"misc\": \"{\\\"address\\\":\\\"1012 S Park\\\", \\\"town\\\":\\\"Hastings\\\", \\\"state\\\":\\\"MI\\\"}\"}", "newest blob data"},
+ },
+ },
+ {
+ input: `update src set jd=JSON_SET(jd, '$.current', true) where id = 12`,
+ output: []string{
+ "update dst set jd=JSON_INSERT(`jd`, _utf8mb4'$.current', CAST(_utf8mb4'true' as JSON)) where id=12",
+ },
+ data: [][]string{
+ {"1", "{\"key1\": \"val1\", \"color\": \"red\", \"years\": 5, \"hobbies\": [\"skiing\", \"video games\", \"hiking\"]}", "blob data"},
+ {"3", "{\"key3\": \"val3\"}", "blob data3"},
+ {"12", "{\"key2\": \"val2\", \"misc\": \"{\\\"address\\\":\\\"1012 S Park\\\", \\\"town\\\":\\\"Hastings\\\", \\\"state\\\":\\\"MI\\\"}\", \"current\": true}", "newest blob data"},
+ },
+ },
+ {
+ input: `update src set jd=JSON_SET(jd, '$.idontknow', null, '$.idontknoweither', 'null') where id = 3`,
+ output: []string{
+ "update dst set jd=JSON_INSERT(JSON_INSERT(`jd`, _utf8mb4'$.idontknow', CAST(_utf8mb4'null' as JSON)), _utf8mb4'$.idontknoweither', CAST(JSON_QUOTE(_utf8mb4'null') as JSON)) where id=3",
+ },
+ data: [][]string{
+ {"1", "{\"key1\": \"val1\", \"color\": \"red\", \"years\": 5, \"hobbies\": [\"skiing\", \"video games\", \"hiking\"]}", "blob data"},
+ {"3", "{\"key3\": \"val3\", \"idontknow\": null, \"idontknoweither\": \"null\"}", "blob data3"},
+ {"12", "{\"key2\": \"val2\", \"misc\": \"{\\\"address\\\":\\\"1012 S Park\\\", \\\"town\\\":\\\"Hastings\\\", \\\"state\\\":\\\"MI\\\"}\", \"current\": true}", "newest blob data"},
+ },
+ },
+ {
+ input: `update src set id = id+10 where id = 3`,
+ error: "binary log event missing a needed value for dst.bd due to not using binlog-row-image=FULL",
+ },
+ }...)
+ } else {
+ testCases = append(testCases, []testCase{
+ {
+ input: `update src set jd=JSON_SET(jd, '$.years', 5) where id = 1`,
+ output: []string{
+ "update dst set jd=JSON_INSERT(`jd`, _utf8mb4'$.years', CAST(5 as JSON)), bd=_binary'blob data' where id=1",
+ },
+ data: [][]string{
+ {"1", "{\"key1\": \"val1\", \"color\": \"red\", \"years\": 5}", "blob data"},
+ {"3", "{\"key3\": \"val3\"}", "blob data3"},
+ {"12", "{\"key2\": \"val2\"}", "newest blob data"},
+ },
+ },
+ {
+ input: `update src set jd=JSON_SET(jd, '$.hobbies', JSON_ARRAY('skiing', 'video games', 'hiking')) where id = 1`,
+ output: []string{
+ "update dst set jd=JSON_INSERT(`jd`, _utf8mb4'$.hobbies', JSON_ARRAY(_utf8mb4'skiing', _utf8mb4'video games', _utf8mb4'hiking')), bd=_binary'blob data' where id=1",
+ },
+ data: [][]string{
+ {"1", "{\"key1\": \"val1\", \"color\": \"red\", \"years\": 5, \"hobbies\": [\"skiing\", \"video games\", \"hiking\"]}", "blob data"},
+ {"3", "{\"key3\": \"val3\"}", "blob data3"},
+ {"12", "{\"key2\": \"val2\"}", "newest blob data"},
+ },
+ },
+ {
+ input: `update src set jd=JSON_SET(jd, '$.misc', '{"address":"1012 S Park", "town":"Hastings", "state":"MI"}') where id = 12`,
+ output: []string{
+ "update dst set jd=JSON_INSERT(`jd`, _utf8mb4'$.misc', CAST(JSON_QUOTE(_utf8mb4'{\"address\":\"1012 S Park\", \"town\":\"Hastings\", \"state\":\"MI\"}') as JSON)), bd=_binary'newest blob data' where id=12",
+ },
+ data: [][]string{
+ {"1", "{\"key1\": \"val1\", \"color\": \"red\", \"years\": 5, \"hobbies\": [\"skiing\", \"video games\", \"hiking\"]}", "blob data"},
+ {"3", "{\"key3\": \"val3\"}", "blob data3"},
+ {"12", "{\"key2\": \"val2\", \"misc\": \"{\\\"address\\\":\\\"1012 S Park\\\", \\\"town\\\":\\\"Hastings\\\", \\\"state\\\":\\\"MI\\\"}\"}", "newest blob data"},
+ },
+ },
+ {
+ input: `update src set jd=JSON_SET(jd, '$.current', true) where id = 12`,
+ output: []string{
+ "update dst set jd=JSON_INSERT(`jd`, _utf8mb4'$.current', CAST(_utf8mb4'true' as JSON)), bd=_binary'newest blob data' where id=12",
+ },
+ data: [][]string{
+ {"1", "{\"key1\": \"val1\", \"color\": \"red\", \"years\": 5, \"hobbies\": [\"skiing\", \"video games\", \"hiking\"]}", "blob data"},
+ {"3", "{\"key3\": \"val3\"}", "blob data3"},
+ {"12", "{\"key2\": \"val2\", \"misc\": \"{\\\"address\\\":\\\"1012 S Park\\\", \\\"town\\\":\\\"Hastings\\\", \\\"state\\\":\\\"MI\\\"}\", \"current\": true}", "newest blob data"},
+ },
+ },
+ {
+ input: `update src set jd=JSON_SET(jd, '$.idontknow', null, '$.idontknoweither', 'null') where id = 3`,
+ output: []string{
+ "update dst set jd=JSON_INSERT(JSON_INSERT(`jd`, _utf8mb4'$.idontknow', CAST(_utf8mb4'null' as JSON)), _utf8mb4'$.idontknoweither', CAST(JSON_QUOTE(_utf8mb4'null') as JSON)), bd=_binary'blob data3' where id=3",
+ },
+ data: [][]string{
+ {"1", "{\"key1\": \"val1\", \"color\": \"red\", \"years\": 5, \"hobbies\": [\"skiing\", \"video games\", \"hiking\"]}", "blob data"},
+ {"3", "{\"key3\": \"val3\", \"idontknow\": null, \"idontknoweither\": \"null\"}", "blob data3"},
+ {"12", "{\"key2\": \"val2\", \"misc\": \"{\\\"address\\\":\\\"1012 S Park\\\", \\\"town\\\":\\\"Hastings\\\", \\\"state\\\":\\\"MI\\\"}\", \"current\": true}", "newest blob data"},
+ },
+ },
+ {
+ input: `update src set id = id+10 where id = 3`,
+ output: []string{
+ "delete from dst where id=3",
+ "insert into dst(id,jd,bd) values (13,JSON_OBJECT(_utf8mb4'idontknow', null, _utf8mb4'idontknoweither', _utf8mb4'null', _utf8mb4'key3', _utf8mb4'val3'),_binary'blob data3')",
+ },
+ data: [][]string{
+ {"1", "{\"key1\": \"val1\", \"color\": \"red\", \"years\": 5, \"hobbies\": [\"skiing\", \"video games\", \"hiking\"]}", "blob data"},
+ {"12", "{\"key2\": \"val2\", \"misc\": \"{\\\"address\\\":\\\"1012 S Park\\\", \\\"town\\\":\\\"Hastings\\\", \\\"state\\\":\\\"MI\\\"}\", \"current\": true}", "newest blob data"},
+ {"13", "{\"key3\": \"val3\", \"idontknow\": null, \"idontknoweither\": \"null\"}", "blob data3"},
+ },
+ },
+ }...)
+ }
+
+ for _, tc := range testCases {
+ t.Run(tc.input, func(t *testing.T) {
+ execStatements(t, []string{tc.input})
+ var want qh.ExpectationSequencer
+ if tc.error != "" {
+ if vttablet.DefaultVReplicationConfig.ExperimentalFlags&vttablet.VReplicationExperimentalFlagVPlayerBatching == 0 {
+ want = qh.Expect(
+ "begin",
+ "delete from dst where id=3",
+ "rollback",
+ ).Then(qh.Immediately(
+ fmt.Sprintf("/update _vt.vreplication set message=.*%s.*", tc.error),
+ ))
+ } else {
+ want = qh.Expect(
+ "rollback",
+ ).Then(qh.Immediately(
+ fmt.Sprintf("/update _vt.vreplication set message=.*%s.*", tc.error),
+ ))
+ }
+ expectDBClientQueries(t, want)
+ } else {
+ want = qh.Expect(
+ "begin",
+ tc.output...,
+ ).Then(qh.Immediately(
+ "/update _vt.vreplication set pos=",
+ "commit",
+ ))
+ expectDBClientQueries(t, want)
+ expectData(t, "dst", tc.data)
+ }
+ })
+ }
+}
+
func TestPlayerTypes(t *testing.T) {
defer deleteTablet(addTablet(100))
execStatements(t, []string{
@@ -1575,12 +1865,14 @@ func TestPlayerTypes(t *testing.T) {
}
cancel, _ := startVReplication(t, bls, "")
defer cancel()
+
type testcase struct {
input string
output string
table string
data [][]string
}
+
testcases := []testcase{{
input: "insert into vitess_ints values(-128, 255, -32768, 65535, -8388608, 16777215, -2147483648, 4294967295, -9223372036854775808, 18446744073709551615, 2012)",
output: "insert into vitess_ints(tiny,tinyu,small,smallu,medium,mediumu,normal,normalu,big,bigu,y) values (-128,255,-32768,65535,-8388608,16777215,-2147483648,4294967295,-9223372036854775808,18446744073709551615,2012)",
@@ -1653,15 +1945,30 @@ func TestPlayerTypes(t *testing.T) {
{"1", "", "{}", "123", `{"a": [42, 100]}`, `{"foo": "bar"}`},
{"2", "null", `{"name": null}`, "123", `{"a": [42, 100]}`, `{"foo": "bar"}`},
},
- }, {
- input: "update vitess_json set val1 = '{\"bar\": \"foo\"}', val4 = '{\"a\": [98, 123]}', val5 = convert(x'7b7d' using utf8mb4) where id=1",
- output: "update vitess_json set val1=JSON_OBJECT(_utf8mb4'bar', _utf8mb4'foo'), val2=JSON_OBJECT(), val3=CAST(123 as JSON), val4=JSON_OBJECT(_utf8mb4'a', JSON_ARRAY(98, 123)), val5=JSON_OBJECT() where id=1",
- table: "vitess_json",
- data: [][]string{
- {"1", `{"bar": "foo"}`, "{}", "123", `{"a": [98, 123]}`, `{}`},
- {"2", "null", `{"name": null}`, "123", `{"a": [42, 100]}`, `{"foo": "bar"}`},
- },
}}
+ if runPartialJSONTest {
+ // With partial JSON values we don't replicate the JSON columns that aren't
+ // actually updated.
+ testcases = append(testcases, testcase{
+ input: "update vitess_json set val1 = '{\"bar\": \"foo\"}', val4 = '{\"a\": [98, 123]}', val5 = convert(x'7b7d' using utf8mb4) where id=1",
+ output: "update vitess_json set val1=JSON_OBJECT(_utf8mb4'bar', _utf8mb4'foo'), val4=JSON_OBJECT(_utf8mb4'a', JSON_ARRAY(98, 123)), val5=JSON_OBJECT() where id=1",
+ table: "vitess_json",
+ data: [][]string{
+ {"1", `{"bar": "foo"}`, "{}", "123", `{"a": [98, 123]}`, `{}`},
+ {"2", "null", `{"name": null}`, "123", `{"a": [42, 100]}`, `{"foo": "bar"}`},
+ },
+ })
+ } else {
+ testcases = append(testcases, testcase{
+ input: "update vitess_json set val1 = '{\"bar\": \"foo\"}', val4 = '{\"a\": [98, 123]}', val5 = convert(x'7b7d' using utf8mb4) where id=1",
+ output: "update vitess_json set val1=JSON_OBJECT(_utf8mb4'bar', _utf8mb4'foo'), val2=JSON_OBJECT(), val3=CAST(123 as JSON), val4=JSON_OBJECT(_utf8mb4'a', JSON_ARRAY(98, 123)), val5=JSON_OBJECT() where id=1",
+ table: "vitess_json",
+ data: [][]string{
+ {"1", `{"bar": "foo"}`, "{}", "123", `{"a": [98, 123]}`, `{}`},
+ {"2", "null", `{"name": null}`, "123", `{"a": [42, 100]}`, `{"foo": "bar"}`},
+ },
+ })
+ }
for _, tcases := range testcases {
execStatements(t, []string{tcases.input})
diff --git a/go/vt/vttablet/tabletserver/controller.go b/go/vt/vttablet/tabletserver/controller.go
index cef0dd2baee..c4a4bef99fc 100644
--- a/go/vt/vttablet/tabletserver/controller.go
+++ b/go/vt/vttablet/tabletserver/controller.go
@@ -119,6 +119,9 @@ type Controller interface {
// WaitForPreparedTwoPCTransactions waits for all prepared transactions to be resolved.
WaitForPreparedTwoPCTransactions(ctx context.Context) error
+
+ // SetDemotePrimaryStalled marks that demote primary is stalled in the state manager.
+ SetDemotePrimaryStalled()
}
// Ensure TabletServer satisfies Controller interface.
diff --git a/go/vt/vttablet/tabletserver/query_executor.go b/go/vt/vttablet/tabletserver/query_executor.go
index 519b60b79d6..e4a165960fd 100644
--- a/go/vt/vttablet/tabletserver/query_executor.go
+++ b/go/vt/vttablet/tabletserver/query_executor.go
@@ -69,7 +69,9 @@ type QueryExecutor struct {
}
const (
- streamRowsSize = 256
+ streamRowsSize = 256
+ resetLastIDQuery = "select last_insert_id(18446744073709547416)"
+ resetLastIDValue = 18446744073709547416
)
var (
@@ -1111,42 +1113,97 @@ func (qre *QueryExecutor) getSelectLimit() int64 {
func (qre *QueryExecutor) execDBConn(conn *connpool.Conn, sql string, wantfields bool) (*sqltypes.Result, error) {
span, ctx := trace.NewSpan(qre.ctx, "QueryExecutor.execDBConn")
defer span.Finish()
-
defer qre.logStats.AddRewrittenSQL(sql, time.Now())
qd := NewQueryDetail(qre.logStats.Ctx, conn)
- err := qre.tsv.statelessql.Add(qd)
- if err != nil {
+
+ if err := qre.tsv.statelessql.Add(qd); err != nil {
return nil, err
}
defer qre.tsv.statelessql.Remove(qd)
- return conn.Exec(ctx, sql, int(qre.tsv.qe.maxResultSize.Load()), wantfields)
+ if err := qre.resetLastInsertIDIfNeeded(ctx, conn); err != nil {
+ return nil, err
+ }
+
+ exec, err := conn.Exec(ctx, sql, int(qre.tsv.qe.maxResultSize.Load()), wantfields)
+ if err != nil {
+ return nil, err
+ }
+
+ if err := qre.fetchLastInsertID(ctx, conn, exec); err != nil {
+ return nil, err
+ }
+
+ return exec, nil
}
func (qre *QueryExecutor) execStatefulConn(conn *StatefulConnection, sql string, wantfields bool) (*sqltypes.Result, error) {
span, ctx := trace.NewSpan(qre.ctx, "QueryExecutor.execStatefulConn")
defer span.Finish()
-
defer qre.logStats.AddRewrittenSQL(sql, time.Now())
qd := NewQueryDetail(qre.logStats.Ctx, conn)
- err := qre.tsv.statefulql.Add(qd)
- if err != nil {
+
+ if err := qre.tsv.statefulql.Add(qd); err != nil {
return nil, err
}
defer qre.tsv.statefulql.Remove(qd)
- return conn.Exec(ctx, sql, int(qre.tsv.qe.maxResultSize.Load()), wantfields)
+ if err := qre.resetLastInsertIDIfNeeded(ctx, conn.UnderlyingDBConn().Conn); err != nil {
+ return nil, err
+ }
+
+ exec, err := conn.Exec(ctx, sql, int(qre.tsv.qe.maxResultSize.Load()), wantfields)
+ if err != nil {
+ return nil, err
+ }
+
+ if err := qre.fetchLastInsertID(ctx, conn.UnderlyingDBConn().Conn, exec); err != nil {
+ return nil, err
+ }
+
+ return exec, nil
+}
+
+func (qre *QueryExecutor) resetLastInsertIDIfNeeded(ctx context.Context, conn *connpool.Conn) error {
+ if qre.options.GetFetchLastInsertId() {
+ // if the query contains a last_insert_id(x) function,
+ // we need to reset the last insert id to check if it was set by the query or not
+ _, err := conn.Exec(ctx, resetLastIDQuery, 1, false)
+ if err != nil {
+ return err
+ }
+ }
+ return nil
+}
+
+func (qre *QueryExecutor) fetchLastInsertID(ctx context.Context, conn *connpool.Conn, exec *sqltypes.Result) error {
+ if exec.InsertIDUpdated() || !qre.options.GetFetchLastInsertId() {
+ return nil
+ }
+
+ result, err := conn.Exec(ctx, "select last_insert_id()", 1, false)
+ if err != nil {
+ return err
+ }
+
+ cell := result.Rows[0][0]
+ insertID, err := cell.ToCastUint64()
+ if err != nil {
+ return err
+ }
+ if resetLastIDValue != insertID {
+ exec.InsertID = insertID
+ exec.InsertIDChanged = true
+ }
+ return nil
}
func (qre *QueryExecutor) execStreamSQL(conn *connpool.PooledConn, isTransaction bool, sql string, callback func(*sqltypes.Result) error) error {
span, ctx := trace.NewSpan(qre.ctx, "QueryExecutor.execStreamSQL")
+ defer span.Finish()
trace.AnnotateSQL(span, sqlparser.Preview(sql))
- callBackClosingSpan := func(result *sqltypes.Result) error {
- defer span.Finish()
- return callback(result)
- }
start := time.Now()
defer qre.logStats.AddRewrittenSQL(sql, start)
@@ -1157,20 +1214,47 @@ func (qre *QueryExecutor) execStreamSQL(conn *connpool.PooledConn, isTransaction
// This change will ensure that long-running streaming stateful queries get gracefully shutdown during ServingTypeChange
// once their grace period is over.
qd := NewQueryDetail(qre.logStats.Ctx, conn.Conn)
+
+ if err := qre.resetLastInsertIDIfNeeded(ctx, conn.Conn); err != nil {
+ return err
+ }
+
+ lastInsertIDSet := false
+ cb := func(result *sqltypes.Result) error {
+ if result != nil && result.InsertIDUpdated() {
+ lastInsertIDSet = true
+ }
+ return callback(result)
+ }
+
+ var err error
if isTransaction {
- err := qre.tsv.statefulql.Add(qd)
+ err = qre.tsv.statefulql.Add(qd)
if err != nil {
return err
}
defer qre.tsv.statefulql.Remove(qd)
- return conn.Conn.StreamOnce(ctx, sql, callBackClosingSpan, allocStreamResult, int(qre.tsv.qe.streamBufferSize.Load()), sqltypes.IncludeFieldsOrDefault(qre.options))
+ err = conn.Conn.StreamOnce(ctx, sql, cb, allocStreamResult, int(qre.tsv.qe.streamBufferSize.Load()), sqltypes.IncludeFieldsOrDefault(qre.options))
+ } else {
+ err = qre.tsv.olapql.Add(qd)
+ if err != nil {
+ return err
+ }
+ defer qre.tsv.olapql.Remove(qd)
+ err = conn.Conn.Stream(ctx, sql, cb, allocStreamResult, int(qre.tsv.qe.streamBufferSize.Load()), sqltypes.IncludeFieldsOrDefault(qre.options))
}
- err := qre.tsv.olapql.Add(qd)
- if err != nil {
+
+ if err != nil || lastInsertIDSet || !qre.options.GetFetchLastInsertId() {
return err
}
- defer qre.tsv.olapql.Remove(qd)
- return conn.Conn.Stream(ctx, sql, callBackClosingSpan, allocStreamResult, int(qre.tsv.qe.streamBufferSize.Load()), sqltypes.IncludeFieldsOrDefault(qre.options))
+ res := &sqltypes.Result{}
+ if err = qre.fetchLastInsertID(ctx, conn.Conn, res); err != nil {
+ return err
+ }
+ if res.InsertIDUpdated() {
+ return callback(res)
+ }
+ return nil
}
func (qre *QueryExecutor) recordUserQuery(queryType string, duration int64) {
diff --git a/go/vt/vttablet/tabletserver/state_manager.go b/go/vt/vttablet/tabletserver/state_manager.go
index cae6a237dc8..4512b26f177 100644
--- a/go/vt/vttablet/tabletserver/state_manager.go
+++ b/go/vt/vttablet/tabletserver/state_manager.go
@@ -87,18 +87,19 @@ type stateManager struct {
//
// If a transition fails, we set retrying to true and launch
// retryTransition which loops until the state converges.
- mu sync.Mutex
- wantState servingState
- wantTabletType topodatapb.TabletType
- state servingState
- target *querypb.Target
- ptsTimestamp time.Time
- retrying bool
- replHealthy bool
- lameduck bool
- alsoAllow []topodatapb.TabletType
- reason string
- transitionErr error
+ mu sync.Mutex
+ wantState servingState
+ wantTabletType topodatapb.TabletType
+ state servingState
+ target *querypb.Target
+ ptsTimestamp time.Time
+ retrying bool
+ replHealthy bool
+ demotePrimaryStalled bool
+ lameduck bool
+ alsoAllow []topodatapb.TabletType
+ reason string
+ transitionErr error
rw *requestsWaiter
@@ -387,7 +388,7 @@ func (sm *stateManager) StartRequest(ctx context.Context, target *querypb.Target
sm.mu.Lock()
defer sm.mu.Unlock()
- if sm.state != StateServing || !sm.replHealthy {
+ if sm.state != StateServing || !sm.replHealthy || sm.demotePrimaryStalled {
// This specific error string needs to be returned for vtgate buffering to work.
return vterrors.New(vtrpcpb.Code_CLUSTER_EVENT, vterrors.NotServing)
}
@@ -715,6 +716,10 @@ func (sm *stateManager) Broadcast() {
defer sm.mu.Unlock()
lag, err := sm.refreshReplHealthLocked()
+ if sm.demotePrimaryStalled {
+ // If we are stalled while demoting primary, we should send an error for it.
+ err = vterrors.VT09031()
+ }
sm.hs.ChangeState(sm.target.TabletType, sm.ptsTimestamp, lag, err, sm.isServingLocked())
}
@@ -772,7 +777,7 @@ func (sm *stateManager) IsServing() bool {
}
func (sm *stateManager) isServingLocked() bool {
- return sm.state == StateServing && sm.wantState == StateServing && sm.replHealthy && !sm.lameduck
+ return sm.state == StateServing && sm.wantState == StateServing && sm.replHealthy && !sm.demotePrimaryStalled && !sm.lameduck
}
func (sm *stateManager) AppendDetails(details []*kv) []*kv {
diff --git a/go/vt/vttablet/tabletserver/state_manager_test.go b/go/vt/vttablet/tabletserver/state_manager_test.go
index df819c6f05c..f8059d6edea 100644
--- a/go/vt/vttablet/tabletserver/state_manager_test.go
+++ b/go/vt/vttablet/tabletserver/state_manager_test.go
@@ -669,6 +669,45 @@ func TestStateManagerNotify(t *testing.T) {
sm.StopService()
}
+func TestDemotePrimaryStalled(t *testing.T) {
+ sm := newTestStateManager()
+ defer sm.StopService()
+ err := sm.SetServingType(topodatapb.TabletType_PRIMARY, testNow, StateServing, "")
+ require.NoError(t, err)
+ // Stopping the ticker so that we don't get unexpected health streams.
+ sm.hcticks.Stop()
+
+ ch := make(chan *querypb.StreamHealthResponse, 5)
+ var wg sync.WaitGroup
+ wg.Add(1)
+ go func() {
+ defer wg.Done()
+ err := sm.hs.Stream(context.Background(), func(shr *querypb.StreamHealthResponse) error {
+ ch <- shr
+ return nil
+ })
+ assert.Contains(t, err.Error(), "tabletserver is shutdown")
+ }()
+ defer wg.Wait()
+
+ // Send a broadcast message and check we have no error there.
+ sm.Broadcast()
+ gotshr := <-ch
+ require.Empty(t, gotshr.RealtimeStats.HealthError)
+
+ // If demote primary is stalled, then we should get an error.
+ sm.demotePrimaryStalled = true
+ sm.Broadcast()
+ gotshr = <-ch
+ require.EqualValues(t, "VT09031: Primary demotion is stalled", gotshr.RealtimeStats.HealthError)
+ // Verify that we can't start a new request once we have a demote primary stalled.
+ err = sm.StartRequest(context.Background(), &querypb.Target{TabletType: topodatapb.TabletType_PRIMARY}, false)
+ require.ErrorContains(t, err, "operation not allowed in state NOT_SERVING")
+
+ // Stop the state manager.
+ sm.StopService()
+}
+
func TestRefreshReplHealthLocked(t *testing.T) {
sm := newTestStateManager()
defer sm.StopService()
diff --git a/go/vt/vttablet/tabletserver/tabletserver.go b/go/vt/vttablet/tabletserver/tabletserver.go
index 847de25eb02..deeac10bd05 100644
--- a/go/vt/vttablet/tabletserver/tabletserver.go
+++ b/go/vt/vttablet/tabletserver/tabletserver.go
@@ -758,6 +758,14 @@ func (tsv *TabletServer) WaitForPreparedTwoPCTransactions(ctx context.Context) e
}
}
+// SetDemotePrimaryStalled marks that demote primary is stalled in the state manager.
+func (tsv *TabletServer) SetDemotePrimaryStalled() {
+ tsv.sm.mu.Lock()
+ tsv.sm.demotePrimaryStalled = true
+ tsv.sm.mu.Unlock()
+ tsv.BroadcastHealth()
+}
+
// CreateTransaction creates the metadata for a 2PC transaction.
func (tsv *TabletServer) CreateTransaction(ctx context.Context, target *querypb.Target, dtid string, participants []*querypb.Target) (err error) {
return tsv.execRequest(
diff --git a/go/vt/vttablet/tabletserver/vstreamer/vstreamer.go b/go/vt/vttablet/tabletserver/vstreamer/vstreamer.go
index 59db723ff2b..fb4cb324047 100644
--- a/go/vt/vttablet/tabletserver/vstreamer/vstreamer.go
+++ b/go/vt/vttablet/tabletserver/vstreamer/vstreamer.go
@@ -623,7 +623,7 @@ func (vs *vstreamer) parseEvent(ev mysql.BinlogEvent, bufferAndTransmit func(vev
if vevent != nil {
vevents = append(vevents, vevent)
}
- case ev.IsWriteRows() || ev.IsDeleteRows() || ev.IsUpdateRows():
+ case ev.IsWriteRows() || ev.IsDeleteRows() || ev.IsUpdateRows() || ev.IsPartialUpdateRows():
// The existence of before and after images can be used to
// identify statement types. It's also possible that the
// before and after images end up going to different shards.
@@ -973,7 +973,7 @@ func (vs *vstreamer) processJournalEvent(vevents []*binlogdatapb.VEvent, plan *s
}
nextrow:
for _, row := range rows.Rows {
- afterOK, afterValues, _, err := vs.extractRowAndFilter(plan, row.Data, rows.DataColumns, row.NullColumns)
+ afterOK, afterValues, _, err := vs.extractRowAndFilter(plan, row.Data, rows.DataColumns, row.NullColumns, row.JSONPartialValues)
if err != nil {
return nil, err
}
@@ -1011,11 +1011,14 @@ nextrow:
func (vs *vstreamer) processRowEvent(vevents []*binlogdatapb.VEvent, plan *streamerPlan, rows mysql.Rows) ([]*binlogdatapb.VEvent, error) {
rowChanges := make([]*binlogdatapb.RowChange, 0, len(rows.Rows))
for _, row := range rows.Rows {
- beforeOK, beforeValues, _, err := vs.extractRowAndFilter(plan, row.Identify, rows.IdentifyColumns, row.NullIdentifyColumns)
+ // The BEFORE image does not have partial JSON values so we pass an empty bitmap.
+ beforeOK, beforeValues, _, err := vs.extractRowAndFilter(plan, row.Identify, rows.IdentifyColumns, row.NullIdentifyColumns, mysql.Bitmap{})
if err != nil {
return nil, err
}
- afterOK, afterValues, partial, err := vs.extractRowAndFilter(plan, row.Data, rows.DataColumns, row.NullColumns)
+ // The AFTER image is where we may have partial JSON values, as reflected in the
+ // row's JSONPartialValues bitmap.
+ afterOK, afterValues, partial, err := vs.extractRowAndFilter(plan, row.Data, rows.DataColumns, row.NullColumns, row.JSONPartialValues)
if err != nil {
return nil, err
}
@@ -1028,14 +1031,20 @@ func (vs *vstreamer) processRowEvent(vevents []*binlogdatapb.VEvent, plan *strea
}
if afterOK {
rowChange.After = sqltypes.RowToProto3(afterValues)
- if (vs.config.ExperimentalFlags /**/ & /**/ vttablet.VReplicationExperimentalFlagAllowNoBlobBinlogRowImage != 0) &&
- partial {
+ if ((vs.config.ExperimentalFlags /**/ & /**/ vttablet.VReplicationExperimentalFlagAllowNoBlobBinlogRowImage != 0) && partial) ||
+ (row.JSONPartialValues.Count() > 0) {
rowChange.DataColumns = &binlogdatapb.RowChange_Bitmap{
Count: int64(rows.DataColumns.Count()),
Cols: rows.DataColumns.Bits(),
}
}
+ if row.JSONPartialValues.Count() > 0 {
+ rowChange.JsonPartialValues = &binlogdatapb.RowChange_Bitmap{
+ Count: int64(row.JSONPartialValues.Count()),
+ Cols: row.JSONPartialValues.Bits(),
+ }
+ }
}
rowChanges = append(rowChanges, rowChange)
}
@@ -1081,13 +1090,14 @@ func (vs *vstreamer) rebuildPlans() error {
// - true, if row needs to be skipped because of workflow filter rules
// - data values, array of one value per column
// - true, if the row image was partial (i.e. binlog_row_image=noblob and dml doesn't update one or more blob/text columns)
-func (vs *vstreamer) extractRowAndFilter(plan *streamerPlan, data []byte, dataColumns, nullColumns mysql.Bitmap) (bool, []sqltypes.Value, bool, error) {
+func (vs *vstreamer) extractRowAndFilter(plan *streamerPlan, data []byte, dataColumns, nullColumns mysql.Bitmap, jsonPartialValues mysql.Bitmap) (bool, []sqltypes.Value, bool, error) {
if len(data) == 0 {
return false, nil, false, nil
}
values := make([]sqltypes.Value, dataColumns.Count())
charsets := make([]collations.ID, len(values))
valueIndex := 0
+ jsonIndex := 0
pos := 0
partial := false
for colNum := 0; colNum < dataColumns.Count(); colNum++ {
@@ -1101,9 +1111,17 @@ func (vs *vstreamer) extractRowAndFilter(plan *streamerPlan, data []byte, dataCo
}
if nullColumns.Bit(valueIndex) {
valueIndex++
+ if plan.Table.Fields[colNum].Type == querypb.Type_JSON {
+ jsonIndex++
+ }
continue
}
- value, l, err := mysqlbinlog.CellValue(data, pos, plan.TableMap.Types[colNum], plan.TableMap.Metadata[colNum], plan.Table.Fields[colNum])
+ partialJSON := false
+ if jsonPartialValues.Count() > 0 && plan.Table.Fields[colNum].Type == querypb.Type_JSON {
+ partialJSON = jsonPartialValues.Bit(jsonIndex)
+ jsonIndex++
+ }
+ value, l, err := mysqlbinlog.CellValue(data, pos, plan.TableMap.Types[colNum], plan.TableMap.Metadata[colNum], plan.Table.Fields[colNum], partialJSON)
if err != nil {
log.Errorf("extractRowAndFilter: %s, table: %s, colNum: %d, fields: %+v, current values: %+v",
err, plan.Table.Name, colNum, plan.Table.Fields, values)
diff --git a/go/vt/vttablet/tabletservermock/controller.go b/go/vt/vttablet/tabletservermock/controller.go
index 9d570b8f6c7..a5242751454 100644
--- a/go/vt/vttablet/tabletservermock/controller.go
+++ b/go/vt/vttablet/tabletservermock/controller.go
@@ -274,6 +274,11 @@ func (tqsc *Controller) WaitForPreparedTwoPCTransactions(context.Context) error
return nil
}
+// SetDemotePrimaryStalled is part of the tabletserver.Controller interface
+func (tqsc *Controller) SetDemotePrimaryStalled() {
+ tqsc.MethodCalled["SetDemotePrimaryStalled"] = true
+}
+
// EnterLameduck implements tabletserver.Controller.
func (tqsc *Controller) EnterLameduck() {
tqsc.mu.Lock()
diff --git a/go/vt/wrangler/vdiff.go b/go/vt/wrangler/vdiff.go
index 4caad42ce1f..2e9fc5f508d 100644
--- a/go/vt/wrangler/vdiff.go
+++ b/go/vt/wrangler/vdiff.go
@@ -167,6 +167,8 @@ type shardStreamer struct {
err error
}
+var _ engine.StreamExecutor = (*shardStreamer)(nil)
+
// VDiff reports differences between the sources and targets of a vreplication workflow.
func (wr *Wrangler) VDiff(ctx context.Context, targetKeyspace, workflowName, sourceCell, targetCell, tabletTypesStr string,
filteredReplicationWaitTime time.Duration, format string, maxRows int64, tables string, debug, onlyPks bool,
@@ -1148,7 +1150,7 @@ func (pe *primitiveExecutor) drain(ctx context.Context) (int, error) {
// -----------------------------------------------------------------
// shardStreamer
-func (sm *shardStreamer) StreamExecute(ctx context.Context, vcursor engine.VCursor, bindVars map[string]*querypb.BindVariable, wantfields bool, callback func(*sqltypes.Result) error) error {
+func (sm *shardStreamer) StreamExecute(_ context.Context, _ engine.VCursor, _ map[string]*querypb.BindVariable, _, _ bool, callback func(*sqltypes.Result) error) error {
for result := range sm.result {
if err := callback(result); err != nil {
return err
diff --git a/proto/binlogdata.proto b/proto/binlogdata.proto
index e1df792776b..3d55de7ea14 100644
--- a/proto/binlogdata.proto
+++ b/proto/binlogdata.proto
@@ -333,8 +333,17 @@ message RowChange {
}
query.Row before = 1;
query.Row after = 2;
- // DataColumns is a bitmap of all columns: bit is set if column is present in the after image
+ // DataColumns is a bitmap of all columns: bit is set if column is
+ // present in the after image.
Bitmap data_columns = 3;
+ // JsonPartialValues is a bitmap of any JSON columns, where the bit
+ // is set if the value in the AFTER image is a partial JSON value
+ // that is represented as an expression of
+ // JSON_[INSERT|REPLACE|REMOVE](%s, '$.path', value) which then is
+ // used to add/update/remove a path in the JSON document. When the
+ // value is used the fmt directive must be replaced by the actual
+ // column name of the JSON field.
+ Bitmap json_partial_values = 4;
}
// RowEvent represent row events for one table.
diff --git a/proto/query.proto b/proto/query.proto
index c5f53ea6e5d..27a04d77f0a 100644
--- a/proto/query.proto
+++ b/proto/query.proto
@@ -363,6 +363,12 @@ message ExecuteOptions {
oneof timeout {
int64 authoritative_timeout = 17;
}
+
+ // fetch_last_insert_id indicates that after executing a DML involving last_insert_id(x),
+ // a subsequent "SELECT last_insert_id()" should be performed to retrieve the updated value.
+ // This is to circumvent a bug where setting last_insert_id(x) to zero is not signaled by mysql
+ // https://bugs.mysql.com/bug.php?id=116939
+ bool fetch_last_insert_id = 18;
}
// Field describes a single column returned by a query
@@ -427,6 +433,7 @@ message QueryResult {
repeated Row rows = 4;
string info = 6;
string session_state_changes = 7;
+ bool insert_id_changed=8;
}
// QueryWarning is used to convey out of band query execution warnings
diff --git a/test/bin/.keep b/test/bin/.keep
new file mode 100644
index 00000000000..7f6eda3a448
--- /dev/null
+++ b/test/bin/.keep
@@ -0,0 +1 @@
+Do not remove. Ensures existence of directory.
diff --git a/test/bin/rippled b/test/bin/rippled
deleted file mode 100755
index c7b6bea3b95..00000000000
Binary files a/test/bin/rippled and /dev/null differ
diff --git a/test/ci_workflow_gen.go b/test/ci_workflow_gen.go
index b24db1154fb..bf42825d73c 100644
--- a/test/ci_workflow_gen.go
+++ b/test/ci_workflow_gen.go
@@ -176,6 +176,7 @@ type clusterTest struct {
Docker bool
LimitResourceUsage bool
EnableBinlogTransactionCompression bool
+ EnablePartialJSON bool
PartialKeyspace bool
Cores16 bool
NeedsMinio bool
@@ -306,6 +307,7 @@ func generateClusterWorkflows(list []string, tpl string) {
}
if strings.Contains(cluster, "vrepl") {
test.EnableBinlogTransactionCompression = true
+ test.EnablePartialJSON = true
}
mysqlVersionIndicator := ""
if mysqlVersion != defaultMySQLVersion && len(clusterMySQLVersions()) > 1 {
diff --git a/test/templates/cluster_endtoend_test.tpl b/test/templates/cluster_endtoend_test.tpl
index 8d0a2f650b5..f51b06a2faf 100644
--- a/test/templates/cluster_endtoend_test.tpl
+++ b/test/templates/cluster_endtoend_test.tpl
@@ -224,6 +224,12 @@ jobs:
EOF
{{end}}
+ {{if .EnablePartialJSON}}
+ cat <<-EOF>>./config/mycnf/mysql8026.cnf
+ binlog-row-value-options=PARTIAL_JSON
+ EOF
+ {{end}}
+
# run the tests however you normally do, then produce a JUnit XML file
eatmydata -- go run test.go -docker={{if .Docker}}true -flavor={{.Platform}}{{else}}false{{end}} -follow -shard {{.Shard}}{{if .PartialKeyspace}} -partial-keyspace=true {{end}}{{if .BuildTag}} -build-tag={{.BuildTag}} {{end}} | tee -a output.txt | go-junit-report -set-exit-code > report.xml
diff --git a/test/templates/unit_test.tpl b/test/templates/unit_test.tpl
index 3704aebac4e..f802ee7ad4a 100644
--- a/test/templates/unit_test.tpl
+++ b/test/templates/unit_test.tpl
@@ -177,6 +177,9 @@ jobs:
export NOVTADMINBUILD=1
export VTEVALENGINETEST="{{.Evalengine}}"
+ # We sometimes need to alter the behavior based on the platform we're
+ # testing, e.g. MySQL 5.7 vs 8.0.
+ export CI_DB_PLATFORM="{{.Platform}}"
eatmydata -- make unit_test | tee -a output.txt | go-junit-report -set-exit-code > report.xml
diff --git a/web/vtadmin/src/proto/vtadmin.d.ts b/web/vtadmin/src/proto/vtadmin.d.ts
index 7b921fc034a..adb02034c92 100644
--- a/web/vtadmin/src/proto/vtadmin.d.ts
+++ b/web/vtadmin/src/proto/vtadmin.d.ts
@@ -37394,6 +37394,9 @@ export namespace binlogdata {
/** RowChange data_columns */
data_columns?: (binlogdata.RowChange.IBitmap|null);
+
+ /** RowChange json_partial_values */
+ json_partial_values?: (binlogdata.RowChange.IBitmap|null);
}
/** Represents a RowChange. */
@@ -37414,6 +37417,9 @@ export namespace binlogdata {
/** RowChange data_columns. */
public data_columns?: (binlogdata.RowChange.IBitmap|null);
+ /** RowChange json_partial_values. */
+ public json_partial_values?: (binlogdata.RowChange.IBitmap|null);
+
/**
* Creates a new RowChange instance using the specified properties.
* @param [properties] Properties to set
@@ -40733,6 +40739,9 @@ export namespace query {
/** ExecuteOptions authoritative_timeout */
authoritative_timeout?: (number|Long|null);
+
+ /** ExecuteOptions fetch_last_insert_id */
+ fetch_last_insert_id?: (boolean|null);
}
/** Represents an ExecuteOptions. */
@@ -40783,6 +40792,9 @@ export namespace query {
/** ExecuteOptions authoritative_timeout. */
public authoritative_timeout?: (number|Long|null);
+ /** ExecuteOptions fetch_last_insert_id. */
+ public fetch_last_insert_id: boolean;
+
/** ExecuteOptions timeout. */
public timeout?: "authoritative_timeout";
@@ -41200,6 +41212,9 @@ export namespace query {
/** QueryResult session_state_changes */
session_state_changes?: (string|null);
+
+ /** QueryResult insert_id_changed */
+ insert_id_changed?: (boolean|null);
}
/** Represents a QueryResult. */
@@ -41229,6 +41244,9 @@ export namespace query {
/** QueryResult session_state_changes. */
public session_state_changes: string;
+ /** QueryResult insert_id_changed. */
+ public insert_id_changed: boolean;
+
/**
* Creates a new QueryResult instance using the specified properties.
* @param [properties] Properties to set
diff --git a/web/vtadmin/src/proto/vtadmin.js b/web/vtadmin/src/proto/vtadmin.js
index e5bcf766b40..d71d3e08fe5 100644
--- a/web/vtadmin/src/proto/vtadmin.js
+++ b/web/vtadmin/src/proto/vtadmin.js
@@ -87873,6 +87873,7 @@ export const binlogdata = $root.binlogdata = (() => {
* @property {query.IRow|null} [before] RowChange before
* @property {query.IRow|null} [after] RowChange after
* @property {binlogdata.RowChange.IBitmap|null} [data_columns] RowChange data_columns
+ * @property {binlogdata.RowChange.IBitmap|null} [json_partial_values] RowChange json_partial_values
*/
/**
@@ -87914,6 +87915,14 @@ export const binlogdata = $root.binlogdata = (() => {
*/
RowChange.prototype.data_columns = null;
+ /**
+ * RowChange json_partial_values.
+ * @member {binlogdata.RowChange.IBitmap|null|undefined} json_partial_values
+ * @memberof binlogdata.RowChange
+ * @instance
+ */
+ RowChange.prototype.json_partial_values = null;
+
/**
* Creates a new RowChange instance using the specified properties.
* @function create
@@ -87944,6 +87953,8 @@ export const binlogdata = $root.binlogdata = (() => {
$root.query.Row.encode(message.after, writer.uint32(/* id 2, wireType 2 =*/18).fork()).ldelim();
if (message.data_columns != null && Object.hasOwnProperty.call(message, "data_columns"))
$root.binlogdata.RowChange.Bitmap.encode(message.data_columns, writer.uint32(/* id 3, wireType 2 =*/26).fork()).ldelim();
+ if (message.json_partial_values != null && Object.hasOwnProperty.call(message, "json_partial_values"))
+ $root.binlogdata.RowChange.Bitmap.encode(message.json_partial_values, writer.uint32(/* id 4, wireType 2 =*/34).fork()).ldelim();
return writer;
};
@@ -87990,6 +88001,10 @@ export const binlogdata = $root.binlogdata = (() => {
message.data_columns = $root.binlogdata.RowChange.Bitmap.decode(reader, reader.uint32());
break;
}
+ case 4: {
+ message.json_partial_values = $root.binlogdata.RowChange.Bitmap.decode(reader, reader.uint32());
+ break;
+ }
default:
reader.skipType(tag & 7);
break;
@@ -88040,6 +88055,11 @@ export const binlogdata = $root.binlogdata = (() => {
if (error)
return "data_columns." + error;
}
+ if (message.json_partial_values != null && message.hasOwnProperty("json_partial_values")) {
+ let error = $root.binlogdata.RowChange.Bitmap.verify(message.json_partial_values);
+ if (error)
+ return "json_partial_values." + error;
+ }
return null;
};
@@ -88070,6 +88090,11 @@ export const binlogdata = $root.binlogdata = (() => {
throw TypeError(".binlogdata.RowChange.data_columns: object expected");
message.data_columns = $root.binlogdata.RowChange.Bitmap.fromObject(object.data_columns);
}
+ if (object.json_partial_values != null) {
+ if (typeof object.json_partial_values !== "object")
+ throw TypeError(".binlogdata.RowChange.json_partial_values: object expected");
+ message.json_partial_values = $root.binlogdata.RowChange.Bitmap.fromObject(object.json_partial_values);
+ }
return message;
};
@@ -88090,6 +88115,7 @@ export const binlogdata = $root.binlogdata = (() => {
object.before = null;
object.after = null;
object.data_columns = null;
+ object.json_partial_values = null;
}
if (message.before != null && message.hasOwnProperty("before"))
object.before = $root.query.Row.toObject(message.before, options);
@@ -88097,6 +88123,8 @@ export const binlogdata = $root.binlogdata = (() => {
object.after = $root.query.Row.toObject(message.after, options);
if (message.data_columns != null && message.hasOwnProperty("data_columns"))
object.data_columns = $root.binlogdata.RowChange.Bitmap.toObject(message.data_columns, options);
+ if (message.json_partial_values != null && message.hasOwnProperty("json_partial_values"))
+ object.json_partial_values = $root.binlogdata.RowChange.Bitmap.toObject(message.json_partial_values, options);
return object;
};
@@ -97123,6 +97151,7 @@ export const query = $root.query = (() => {
* @property {string|null} [WorkloadName] ExecuteOptions WorkloadName
* @property {string|null} [priority] ExecuteOptions priority
* @property {number|Long|null} [authoritative_timeout] ExecuteOptions authoritative_timeout
+ * @property {boolean|null} [fetch_last_insert_id] ExecuteOptions fetch_last_insert_id
*/
/**
@@ -97245,6 +97274,14 @@ export const query = $root.query = (() => {
*/
ExecuteOptions.prototype.authoritative_timeout = null;
+ /**
+ * ExecuteOptions fetch_last_insert_id.
+ * @member {boolean} fetch_last_insert_id
+ * @memberof query.ExecuteOptions
+ * @instance
+ */
+ ExecuteOptions.prototype.fetch_last_insert_id = false;
+
// OneOf field names bound to virtual getters and setters
let $oneOfFields;
@@ -97313,6 +97350,8 @@ export const query = $root.query = (() => {
writer.uint32(/* id 16, wireType 2 =*/130).string(message.priority);
if (message.authoritative_timeout != null && Object.hasOwnProperty.call(message, "authoritative_timeout"))
writer.uint32(/* id 17, wireType 0 =*/136).int64(message.authoritative_timeout);
+ if (message.fetch_last_insert_id != null && Object.hasOwnProperty.call(message, "fetch_last_insert_id"))
+ writer.uint32(/* id 18, wireType 0 =*/144).bool(message.fetch_last_insert_id);
return writer;
};
@@ -97406,6 +97445,10 @@ export const query = $root.query = (() => {
message.authoritative_timeout = reader.int64();
break;
}
+ case 18: {
+ message.fetch_last_insert_id = reader.bool();
+ break;
+ }
default:
reader.skipType(tag & 7);
break;
@@ -97534,6 +97577,9 @@ export const query = $root.query = (() => {
if (!$util.isInteger(message.authoritative_timeout) && !(message.authoritative_timeout && $util.isInteger(message.authoritative_timeout.low) && $util.isInteger(message.authoritative_timeout.high)))
return "authoritative_timeout: integer|Long expected";
}
+ if (message.fetch_last_insert_id != null && message.hasOwnProperty("fetch_last_insert_id"))
+ if (typeof message.fetch_last_insert_id !== "boolean")
+ return "fetch_last_insert_id: boolean expected";
return null;
};
@@ -97746,6 +97792,8 @@ export const query = $root.query = (() => {
message.authoritative_timeout = object.authoritative_timeout;
else if (typeof object.authoritative_timeout === "object")
message.authoritative_timeout = new $util.LongBits(object.authoritative_timeout.low >>> 0, object.authoritative_timeout.high >>> 0).toNumber();
+ if (object.fetch_last_insert_id != null)
+ message.fetch_last_insert_id = Boolean(object.fetch_last_insert_id);
return message;
};
@@ -97780,6 +97828,7 @@ export const query = $root.query = (() => {
object.consolidator = options.enums === String ? "CONSOLIDATOR_UNSPECIFIED" : 0;
object.WorkloadName = "";
object.priority = "";
+ object.fetch_last_insert_id = false;
}
if (message.included_fields != null && message.hasOwnProperty("included_fields"))
object.included_fields = options.enums === String ? $root.query.ExecuteOptions.IncludedFields[message.included_fields] === undefined ? message.included_fields : $root.query.ExecuteOptions.IncludedFields[message.included_fields] : message.included_fields;
@@ -97819,6 +97868,8 @@ export const query = $root.query = (() => {
if (options.oneofs)
object.timeout = "authoritative_timeout";
}
+ if (message.fetch_last_insert_id != null && message.hasOwnProperty("fetch_last_insert_id"))
+ object.fetch_last_insert_id = message.fetch_last_insert_id;
return object;
};
@@ -98879,6 +98930,7 @@ export const query = $root.query = (() => {
* @property {Array.|null} [rows] QueryResult rows
* @property {string|null} [info] QueryResult info
* @property {string|null} [session_state_changes] QueryResult session_state_changes
+ * @property {boolean|null} [insert_id_changed] QueryResult insert_id_changed
*/
/**
@@ -98946,6 +98998,14 @@ export const query = $root.query = (() => {
*/
QueryResult.prototype.session_state_changes = "";
+ /**
+ * QueryResult insert_id_changed.
+ * @member {boolean} insert_id_changed
+ * @memberof query.QueryResult
+ * @instance
+ */
+ QueryResult.prototype.insert_id_changed = false;
+
/**
* Creates a new QueryResult instance using the specified properties.
* @function create
@@ -98984,6 +99044,8 @@ export const query = $root.query = (() => {
writer.uint32(/* id 6, wireType 2 =*/50).string(message.info);
if (message.session_state_changes != null && Object.hasOwnProperty.call(message, "session_state_changes"))
writer.uint32(/* id 7, wireType 2 =*/58).string(message.session_state_changes);
+ if (message.insert_id_changed != null && Object.hasOwnProperty.call(message, "insert_id_changed"))
+ writer.uint32(/* id 8, wireType 0 =*/64).bool(message.insert_id_changed);
return writer;
};
@@ -99046,6 +99108,10 @@ export const query = $root.query = (() => {
message.session_state_changes = reader.string();
break;
}
+ case 8: {
+ message.insert_id_changed = reader.bool();
+ break;
+ }
default:
reader.skipType(tag & 7);
break;
@@ -99111,6 +99177,9 @@ export const query = $root.query = (() => {
if (message.session_state_changes != null && message.hasOwnProperty("session_state_changes"))
if (!$util.isString(message.session_state_changes))
return "session_state_changes: string expected";
+ if (message.insert_id_changed != null && message.hasOwnProperty("insert_id_changed"))
+ if (typeof message.insert_id_changed !== "boolean")
+ return "insert_id_changed: boolean expected";
return null;
};
@@ -99168,6 +99237,8 @@ export const query = $root.query = (() => {
message.info = String(object.info);
if (object.session_state_changes != null)
message.session_state_changes = String(object.session_state_changes);
+ if (object.insert_id_changed != null)
+ message.insert_id_changed = Boolean(object.insert_id_changed);
return message;
};
@@ -99201,6 +99272,7 @@ export const query = $root.query = (() => {
object.insert_id = options.longs === String ? "0" : 0;
object.info = "";
object.session_state_changes = "";
+ object.insert_id_changed = false;
}
if (message.fields && message.fields.length) {
object.fields = [];
@@ -99226,6 +99298,8 @@ export const query = $root.query = (() => {
object.info = message.info;
if (message.session_state_changes != null && message.hasOwnProperty("session_state_changes"))
object.session_state_changes = message.session_state_changes;
+ if (message.insert_id_changed != null && message.hasOwnProperty("insert_id_changed"))
+ object.insert_id_changed = message.insert_id_changed;
return object;
};